typespec-typescript-emitter 1.2.0 → 2.0.1

package/dist/src/emit_routedTypemap.d.ts

@@ -0,0 +1,4 @@
+import { Program } from "@typespec/compiler";
+import { TTypeMap } from "./helpers/buildTypeMap.js";
+import { EmitterOptions } from "./lib.js";
+export declare const emitRoutedTypemap: (program: Program, options: EmitterOptions, typemap: TTypeMap) => Promise<void>;

package/dist/src/emit_routedTypemap.js

@@ -0,0 +1,83 @@
+import { emitFile, navigateProgram, resolvePath, } from "@typespec/compiler";
+import { getHttpOperation } from "@typespec/http";
+import { unique2D } from "./helpers/arrays.js";
+import autogenerateWarning from "./helpers/autogenerateWarning.js";
+import { getImports } from "./helpers/getImports.js";
+import { visibilityHelperFileName } from "./helpers/visibilityHelperFile.js";
+import { resolveOperationTypemap, } from "./resolve/operationTypemap.js";
+export const emitRoutedTypemap = async (program, options, typemap) => {
+    // save original targeted namespaces array because it's mutated here
+    const targetedNamespaces = structuredClone(options["root-namespaces"]);
+    const namespaceImports = {};
+    const namespaceOps = {};
+    // finding all operations
+    const foundOps = {};
+    const traverseNamespace = (n, rootName) => {
+        if (!foundOps[rootName])
+            foundOps[rootName] = [];
+        foundOps[rootName].push(...Array.from(n.operations).map((op) => op[1]));
+        n.namespaces.forEach((ns) => traverseNamespace(ns, rootName));
+    };
+    navigateProgram(program, {
+        namespace(n) {
+            const nsIndex = options["root-namespaces"].findIndex((ns) => n.name === ns);
+            if (nsIndex === -1)
+                return;
+            // for some reason, navigateProgram visits each namespace multiple times; this prevents that
+            delete options["root-namespaces"][nsIndex];
+            traverseNamespace(n, n.name);
+        },
+    });
+    // resolving operations
+    for (const ns of Object.entries(foundOps)) {
+        for (const op of ns[1]) {
+            const resolved = await resolveOperationTypemap(program, options, typemap, op);
+            const httpOp = getHttpOperation(program, op)[0];
+            if (!namespaceImports[ns[0]])
+                namespaceImports[ns[0]] = [];
+            namespaceImports[ns[0]].push(...resolved.imports);
+            if (!namespaceOps[ns[0]])
+                namespaceOps[ns[0]] = { ops: {}, hasVisibility: false };
+            if (!namespaceOps[ns[0]].ops[httpOp.path])
+                namespaceOps[ns[0]].ops[httpOp.path] = {};
+            namespaceOps[ns[0]].ops[httpOp.path][httpOp.verb.toUpperCase()] =
+                resolved.types;
+            if (resolved.types.request.hasVisibility ||
+                resolved.types.response.content.some((v) => v.hasVisibility))
+                namespaceOps[ns[0]].hasVisibility = true;
+        }
+    }
+    // emitting
+    for (const ns of Object.entries(namespaceOps)) {
+        const importStrings = getImports(unique2D(namespaceImports[ns[0]]));
+        if (ns[1].hasVisibility) {
+            importStrings.push(`import {Lifecycle, FilterLifecycle} from './${visibilityHelperFileName}';`);
+        }
+        let out = `export type types_${ns[0]}${ns[1].hasVisibility ? "<V extends Lifecycle = Lifecycle.All>" : ""} = {\n`;
+        out += Object.entries(ns[1].ops)
+            .map((path) => {
+            let pathret = `  ['${path[0]}']: {\n`;
+            pathret += Object.entries(path[1])
+                .map((verb) => {
+                let verbret = `    ['${verb[0]}']: {\n`;
+                verbret += `      request: ${verb[1].request.content}\n`;
+                verbret += `      response: ${verb[1].response.content.map((res) => `{status: ${res.status}, body: ${res.body}}`).join(" | ")}\n`;
+                verbret += "    }";
+                return verbret;
+            })
+                .join(",\n");
+            pathret += "\n  }";
+            return pathret;
+        })
+            .join(",\n");
+        out += "\n};\n";
+        const content = `/* eslint-disable */\n\n${autogenerateWarning}\n${importStrings.join("\n")}\n\n${out}`;
+        await emitFile(program, {
+            path: resolvePath(options["out-dir"], `routedTypemap_${ns[0]}.ts`),
+            content: content,
+        });
+    }
+    // restore un-mutated version
+    options["root-namespaces"] = targetedNamespaces;
+};
+//# sourceMappingURL=emit_routedTypemap.js.map

package/dist/src/emit_routedTypemap.js.map

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

package/dist/src/emit_routes.d.ts

@@ -1,2 +1,3 @@
-import { EmitContext, Namespace } from "@typespec/compiler";
-export declare const emitRoutes: (context: EmitContext, namespace: Namespace) => string;
+import { Program } from "@typespec/compiler";
+import { EmitterOptions } from "./lib.js";
+export declare const emitRoutes: (program: Program, options: EmitterOptions) => Promise<void>;

package/dist/src/emit_routes.js

@@ -1,32 +1,38 @@
-import { getDoc, isTemplateDeclaration, } from "@typespec/compiler";
+import { emitFile, getDoc, isTemplateDeclaration, navigateProgram, resolvePath, } from "@typespec/compiler";
 import { getAuthentication, getHttpOperation } from "@typespec/http";
-export const emitRoutes = (context, namespace) => {
-    let out = `export const routes_${context.options["root-namespace"]} = {\n`;
-    const traverseNamespace = (n, nestLevel) => {
-        // operations
-        const processOp = (op) => {
-            const httpOp = getHttpOperation(context.program, op);
-            // jsdoc comment
-            const doc = getDoc(context.program, op);
-            if (doc)
-                out = out.addLine(`/** ${doc} */`, nestLevel + 1);
-            // start op body
-            out = out.addLine(`${op.name}: {`, nestLevel + 1);
-            // HTTP method
-            out = out.addLine(`method: '${httpOp[0].verb.toUpperCase()}',`, nestLevel + 2);
-            // path
-            out = out.addLine(`path: '${httpOp[0].path}',`, nestLevel + 2);
-            // getUrl
-            const pathParams = httpOp[0].parameters.parameters.filter((p) => p.type === "path");
-            const pathParamsArgsString = pathParams
+import { AppendableString } from "./helpers/appendableString.js";
+import autogenerateWarning from "./helpers/autogenerateWarning.js";
+export const emitRoutes = async (program, options) => {
+    // save original targeted namespaces array because it's mutated here
+    const targetedNamespaces = structuredClone(options["root-namespaces"]);
+    const files = {};
+    const traverseNamespace = (n, nestlevel, rootName) => {
+        if (files[rootName] === undefined)
+            files[rootName] = new AppendableString(`export const routes_${rootName} = {\n`);
+        const numCollections = Array.from(n.interfaces ?? []).length +
+            Array.from((n.namespaces ?? [])).length;
+        let i = 1;
+        for (const op of n.operations) {
+            const httpOp = getHttpOperation(program, op[1])[0];
+            const pathParams = httpOp.parameters.parameters.filter((p) => p.type === "path");
+            const urlParams = `params: {${pathParams
                 .map((p) => `${p.name}: string`)
-                .join(", ");
-            const pathParamsArg = `params: {${pathParamsArgsString}}`;
-            const pathParamsOutString = pathParams.reduce((sum, cur) => sum.replaceAll(`{${cur.name}}`, `${"$"}{params.${cur.name}}`), `\`${httpOp[0].path}\``);
-            out = out.addLine(`getUrl: (${pathParams.length > 0 ? pathParamsArg : ""}): string => ${pathParamsOutString},`, nestLevel + 2);
+                .join(", ")}}`;
+            const urlReturn = pathParams.reduce((sum, cur) => sum.replaceAll(`{${cur.name}}`, `${"$"}{params.${cur.name}}`), `\`${httpOp.path}\``);
+            const doc = getDoc(program, op[1]);
+            if (doc)
+                files[rootName].addLine(`/** ${doc} */`
+                    .split("\n")
+                    .map((l) => `${"  ".repeat(nestlevel)}${l}`)
+                    .join("\n"), 0);
+            files[rootName]
+                .addLine(`${op[1].name}: {`, nestlevel)
+                .addLine(`verb: '${httpOp.verb.toUpperCase()}',`, nestlevel + 1)
+                .addLine(`path: '${httpOp.path}',`, nestlevel + 1)
+                .addLine(`getUrl: (${pathParams.length > 0 ? urlParams : ""}): string => ${urlReturn},`, nestlevel + 1);
             // auth
             let auth = [];
-            const opAuth = getAuthentication(context.program, op);
+            const opAuth = getAuthentication(program, op[1]);
             if (opAuth) {
                 opAuth.options.forEach((authOption) => authOption.schemes.forEach((authScheme) => {
                     if (authScheme.type === "noAuth")
@@ -46,7 +52,7 @@ export const emitRoutes = (context, namespace) => {
             }
             else
                 auth = [null];
-            out = out.addLine(`auth: [${auth
+            files[rootName].addLine(`auth: [${auth
                 .map((authEntry) => !authEntry
                 ? "null"
                 : typeof authEntry === "string"
@@ -54,29 +60,49 @@ export const emitRoutes = (context, namespace) => {
                     : `{${Object.entries(authEntry)
                         .map((entry) => `${entry[0]}: '${entry[1]}'`)
                         .join(", ")}}`)
-                .join(", ")}]`, nestLevel + 2);
-            // finalize route entry
-            out = out.addLine("},", nestLevel + 1);
-        }; // end operations
-        n.operations.forEach(processOp);
-        n.interfaces.forEach((itf) => {
-            if (!isTemplateDeclaration(itf))
-                itf.operations.forEach(processOp);
-        });
-        // get and traverse all namespaces
-        let nsnum = 0;
-        n.namespaces.forEach((ns) => {
-            nsnum++;
-            const doc = getDoc(context.program, ns);
+                .join(", ")}]`, nestlevel + 1);
+            files[rootName].addLine(i < n.operations.size || numCollections > 0 ? "}," : "}", nestlevel);
+            i++;
+        }
+        let collectionNum = 1;
+        const printCollection = (n) => {
+            const doc = getDoc(program, n);
             if (doc)
-                out = out.addLine(`/** ${doc} */`, nestLevel + 1);
-            out = out.addLine(`${ns.name}: {`, nestLevel + 1);
-            traverseNamespace(ns, nestLevel + 1);
-            out = out.addLine(`}${nsnum < n.namespaces.size ? "," : ""}`, nestLevel + 1);
+                files[rootName].addLine(`/** ${doc} */`
+                    .split("\n")
+                    .map((l) => `${"  ".repeat(nestlevel)}${l}`)
+                    .join("\n"));
+            files[rootName].addLine(`${n.name}: {`, nestlevel);
+            traverseNamespace(n, nestlevel + 1, rootName);
+            files[rootName].addLine(collectionNum < numCollections ? "}," : "}", nestlevel);
+            collectionNum++;
+        };
+        (n.interfaces ?? []).forEach((i) => {
+            if (!isTemplateDeclaration(i))
+                printCollection(i);
         });
+        (n.namespaces ?? []).forEach((ns) => printCollection(ns));
+        if (n.name === rootName && nestlevel === 1)
+            files[rootName].addLine("} as const;");
     };
-    traverseNamespace(namespace, 0);
-    out += "} as const;\n";
-    return out;
+    navigateProgram(program, {
+        namespace(n) {
+            const nsIndex = options["root-namespaces"].findIndex((ns) => n.name === ns);
+            if (nsIndex === -1)
+                return;
+            // for some reason, navigateProgram visits each namespace multiple times; this prevents that
+            delete options["root-namespaces"][nsIndex];
+            traverseNamespace(n, 1, n.name);
+        },
+    });
+    // emitting
+    for (const file of Object.entries(files)) {
+        await emitFile(program, {
+            path: resolvePath(options["out-dir"], `routes_${file[0]}.ts`),
+            content: `/* eslint-disable */\n\n${autogenerateWarning}\n${file[1].value}`,
+        });
+    }
+    // restore un-mutated version
+    options["root-namespaces"] = targetedNamespaces;
 };
 //# sourceMappingURL=emit_routes.js.map

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":"AAAA,OAAO,EACL,QAAQ,EACR,MAAM,EAEN,qBAAqB,EAErB,eAAe,EAEf,WAAW,GACZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,mBAAmB,MAAM,kCAAkC,CAAC;AAGnE,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,OAAgB,EAChB,OAAuB,EACR,EAAE;IACjB,oEAAoE;IACpE,MAAM,kBAAkB,GAAG,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAEvE,MAAM,KAAK,GAAqC,EAAE,CAAC;IAEnD,MAAM,iBAAiB,GAAG,CACxB,CAAwB,EACxB,SAAiB,EACjB,QAAgB,EAChB,EAAE;QACF,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,SAAS;YAC/B,KAAK,CAAC,QAAQ,CAAC,GAAG,IAAI,gBAAgB,CACpC,uBAAuB,QAAQ,QAAQ,CACxC,CAAC;QAEJ,MAAM,cAAc,GAClB,KAAK,CAAC,IAAI,CAAE,CAAS,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM;YAC9C,KAAK,CAAC,IAAI,CAAC,CAAE,CAAS,CAAC,UAAU,IAAI,EAAE,CAAU,CAAC,CAAC,MAAM,CAAC;QAE5D,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAEnD,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,CACpD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CACzB,CAAC;YACF,MAAM,SAAS,GAAG,YAAY,UAAU;iBACrC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,UAAU,CAAC;iBAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACjB,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,CACjC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CACX,GAAG,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,IAAI,GAAG,EAAE,GAAG,GAAG,WAAW,GAAG,CAAC,IAAI,GAAG,CAAC,EAC/D,KAAK,MAAM,CAAC,IAAI,IAAI,CACrB,CAAC;YAEF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACnC,IAAI,GAAG;gBACL,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CACrB,OAAO,GAAG,KAAK;qBACZ,KAAK,CAAC,IAAI,CAAC;qBACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;qBAC3C,IAAI,CAAC,IAAI,CAAC,EACb,CAAC,CACF,CAAC;YACJ,KAAK,CAAC,QAAQ,CAAC;iBACZ,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,SAAS,CAAC;iBACtC,OAAO,CAAC,UAAU,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,GAAG,CAAC,CAAC;iBAC/D,OAAO,CAAC,UAAU,MAAM,CAAC,IAAI,IAAI,EAAE,SAAS,GAAG,CAAC,CAAC;iBACjD,OAAO,CACN,YAAY,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,SAAS,GAAG,EAC9E,SAAS,GAAG,CAAC,CACd,CAAC;YAEJ,OAAO;YACP,IAAI,IAAI,GAEJ,EAAE,CAAC;YACP,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACjD,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACpC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;oBACxC,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ;wBAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAClD,IAAI,UAAU,CAAC,IAAI,KAAK,MAAM;wBAC5B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;oBAC7C,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ;wBAC9B,IAAI,CAAC,IAAI,CAAC;4BACR,cAAc,EAAE,UAAU,CAAC,EAAE,CAAC,WAAW,EAAE;4BAC3C,UAAU,EAAE,UAAU,CAAC,IAAI;yBAC5B,CAAC,CAAC;oBACL,IAAI,UAAU,CAAC,IAAI,KAAK,QAAQ;wBAC9B,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACrC,IAAI,CAAC,IAAI,CAAC,SAAS,SAAS,CAAC,IAAI,EAAE,CAAC,CACrC,CAAC;oBACJ,IAAI,UAAU,CAAC,IAAI,KAAK,eAAe;wBAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC/D,CAAC,CAAC,CACH,CAAC;YACJ,CAAC;;gBAAM,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;YACrB,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CACrB,UAAU,IAAI;iBACX,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CACjB,CAAC,SAAS;gBACR,CAAC,CAAC,MAAM;gBACR,CAAC,CAAC,OAAO,SAAS,KAAK,QAAQ;oBAC7B,CAAC,CAAC,IAAI,SAAS,GAAG;oBAClB,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;yBAC1B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC;yBAC5C,IAAI,CAAC,IAAI,CAAC,GAAG,CACvB;iBACA,IAAI,CAAC,IAAI,CAAC,GAAG,EAChB,SAAS,GAAG,CAAC,CACd,CAAC;YAEF,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CACrB,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EACxD,SAAS,CACV,CAAC;YACF,CAAC,EAAE,CAAC;QACN,CAAC;QAED,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,MAAM,eAAe,GAAG,CAAC,CAAwB,EAAQ,EAAE;YACzD,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC/B,IAAI,GAAG;gBACL,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CACrB,OAAO,GAAG,KAAK;qBACZ,KAAK,CAAC,IAAI,CAAC;qBACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;qBAC3C,IAAI,CAAC,IAAI,CAAC,CACd,CAAC;YACJ,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,EAAE,SAAS,CAAC,CAAC;YACnD,iBAAiB,CAAC,CAAC,EAAE,SAAS,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC;YAC9C,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CACrB,aAAa,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAC3C,SAAS,CACV,CAAC;YACF,aAAa,EAAE,CAAC;QAClB,CAAC,CAAC;QAED,CAAE,CAAS,CAAC,UAAU,IAAI,EAAE,CAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC3D,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBAAE,eAAe,CAAC,CAAC,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QACF,CAAE,CAAS,CAAC,UAAU,IAAI,EAAE,CAAiB,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAC5D,eAAe,CAAC,EAAE,CAAC,CACpB,CAAC;QACF,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,SAAS,KAAK,CAAC;YACxC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC,CAAC;IACF,eAAe,CAAC,OAAO,EAAE;QACvB,SAAS,CAAC,CAAC;YACT,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,SAAS,CAClD,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CACtB,CAAC;YACF,IAAI,OAAO,KAAK,CAAC,CAAC;gBAAE,OAAO;YAC3B,4FAA4F;YAC5F,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC;YAE3C,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;KACF,CAAC,CAAC;IAEH,WAAW;IACX,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,MAAM,QAAQ,CAAC,OAAO,EAAE;YACtB,IAAI,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,UAAU,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7D,OAAO,EAAE,2BAA2B,mBAAmB,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE;SAC5E,CAAC,CAAC;IACL,CAAC;IAED,6BAA6B;IAC7B,OAAO,CAAC,iBAAiB,CAAC,GAAG,kBAAkB,CAAC;AAClD,CAAC,CAAC"}

package/dist/src/emit_types.d.ts

@@ -1,10 +1,4 @@
-import { EmitContext, Namespace } from "@typespec/compiler";
+import { Program } from "@typespec/compiler";
+import { TTypeMap } from "./helpers/buildTypeMap.js";
 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;
+export declare const emitTypes: (program: Program, options: EmitterOptions, typemap: TTypeMap) => Promise<void>;

package/dist/src/emit_types.js

@@ -1,81 +1,116 @@
-import { getDoc } from "@typespec/compiler";
-import { resolveEnum, resolveModel, resolveUnion, } from "./emit_types_resolve.js";
-import { getTypeguardModel } from "./emit_types_typeguards.js";
-const emitTypes = (context, namespace, options) => {
-    const out = { files: {}, typeguardedNames: [] };
-    const traverseNamespace = (n) => {
-        let file = "";
-        n.enums.forEach((e) => {
-            if (options["enable-types"]) {
-                const resolved = resolveEnum(e, {
-                    context: context,
-                    currentNamespace: n,
-                    nestlevel: 0,
-                    isNamespaceRoot: true,
-                });
-                if (resolved) {
-                    const doc = getDoc(context.program, e);
-                    if (doc)
-                        file = file.addLine(`/** ${doc} */`);
-                    file = file.addLine(`export enum ${e.name} ${resolved};\n`);
-                }
-            }
+import { emitFile, resolvePath } from "@typespec/compiler";
+import { AppendableString } from "./helpers/appendableString.js";
+import { unique2D } from "./helpers/arrays.js";
+import autogenerateWarning from "./helpers/autogenerateWarning.js";
+import { getImports } from "./helpers/getImports.js";
+import { filenameFromNamespaces } from "./helpers/namespaces.js";
+import { visibilityHelperFileName } from "./helpers/visibilityHelperFile.js";
+import { Resolvable } from "./resolve/Resolvable.js";
+import { Resolver } from "./resolve/Resolvable_helpers.js";
+export const emitTypes = async (program, options, typemap) => {
+    // maps file names to file contents
+    const files = {};
+    // maps file names to list of required imports
+    const imports = {};
+    // generate files
+    typemap.forEach((t) => {
+        files[filenameFromNamespaces(t.namespaces)] = new AppendableString();
+        imports[filenameFromNamespaces(t.namespaces)] = {
+            namespaces: [],
+            lifecycleTypes: [],
+        };
+    });
+    const typeOrder = ["Enum", "Scalar", "Model", "Union"];
+    typemap.sort((a, b) => typeOrder.indexOf(a.type.kind) - typeOrder.indexOf(b.type.kind));
+    // resolve all types
+    for (let i = 0; i < typemap.length; i++) {
+        const t = typemap[i];
+        const filename = filenameFromNamespaces(t.namespaces);
+        const resolved = await Resolvable.resolve(Resolver.Type, t.type, {
+            program,
+            options,
+            emitDocs: true,
+            nestlevel: 0,
+            rootType: t,
+            typemap: typemap,
         });
-        n.unions.forEach((u) => {
-            if (options["enable-types"]) {
-                const resolved = resolveUnion(u, {
-                    currentNamespace: n,
-                    context,
-                    nestlevel: 0,
-                    isNamespaceRoot: true,
-                });
-                if (resolved) {
-                    const doc = getDoc(context.program, u);
-                    if (doc)
-                        file = file.addLine(`/** ${doc} */`);
-                    file = file.addLine(`export type ${u.name} = ${resolved};\n`);
+        imports[filename].namespaces.push(...resolved.imports);
+        let declaration = "export ";
+        switch (t.type.kind) {
+            case "Enum":
+                declaration += `enum ${t.type.name}`;
+                break;
+            case "Scalar":
+                declaration += `type ${t.type.name} =`;
+                break;
+            case "Model":
+                declaration += `type ${t.type.name}${resolved.hasVisibility ? "<V extends Lifecycle = Lifecycle.All>" : ""} =`;
+                // Making ALL types generic (regardless of whether they need it) improves ease-of-use,
+                // both for the user as well for the dev when accessing known types.
+                // declaration += `type ${t.type.name}${resolved.hasVisibility ? "<V extends Lifecycle = Lifecycle.All>" : ""} =`;
+                break;
+            case "Union":
+                declaration += `type ${t.type.name}${resolved.hasVisibility ? "<V extends Lifecycle = Lifecycle.All>" : ""} =`;
+                // declaration += `type ${t.type.name}${resolved.hasVisibility ? "<V extends Lifecycle = Lifecycle.All>" : ""} =`;
+                break;
+        }
+        if (resolved.doc)
+            files[filename].addLine(`/** ${resolved.doc} */`);
+        if (resolved.hasVisibility) {
+            imports[filename].lifecycleTypes.push("FilterLifecycle", "Lifecycle");
+        }
+        if (t.type.kind === "Model" &&
+            t.type.name !== "Array" &&
+            t.type.name !== "Record" &&
+            resolved.visibilityMap.replaceAll("{", "").replaceAll("}", "").trim()) {
+            files[filename].addLine(`${declaration} ${resolved.resolved.value}`);
+            // files[filename].addLine(
+            //   `${declaration} FilterLifecycle<${resolved.resolved.value}, typeof ${t.type.name}_VisMap, V>`,
+            // );
+            // files[filename].addLine(
+            //   `export const ${t.type.name}_VisMap = ${resolved.visibilityMap} as const`,
+            // );
+        }
+        else {
+            files[filename].addLine(`${declaration} ${resolved.resolved.value}`);
+        }
+        if (options["enable-typeguards"]) {
+            const typeguard = await Resolvable.resolve(Resolver.Typeguard, t.type, {
+                program,
+                options,
+                nestlevel: 1,
+                rootType: t,
+                typemap: typemap,
+                accessor: "t",
+            });
+            if (typeguard.resolved.value) {
+                if (typeguard.hasVisibility) {
+                    imports[filename].lifecycleTypes.push("Lifecycle");
+                    files[filename].addLine(`export function is${t.type.name}(t: any, vis: Lifecycle = Lifecycle.All): t is ${t.type.name}<typeof vis> {return (${typeguard.resolved})}`);
                 }
-            }
-        });
-        n.models.forEach((m) => {
-            if (options["enable-types"]) {
-                const resolved = resolveModel(m, {
-                    nestlevel: 0,
-                    currentNamespace: n,
-                    context,
-                    isNamespaceRoot: true,
-                });
-                if (resolved) {
-                    const doc = getDoc(context.program, m);
-                    if (doc)
-                        file = file.addLine(`/** ${doc} */`);
-                    file = file.addLine(`export interface ${m.name} ${resolved};`);
+                else {
+                    files[filename].addLine(`export function is${t.type.name}(t: any): t is ${t.type.name} {return (${typeguard.resolved})}`);
                 }
+                imports[filename].namespaces.push(...typeguard.imports);
             }
-            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", undefined, n, !!options["serializable-date-types"])[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";
+        }
+        files[filename].append("\n");
+    }
+    const filesArr = Object.entries(files).filter((f) => !!f[1].value);
+    for (let i = 0; i < filesArr.length; i++) {
+        if (!filesArr[i][1].value)
+            continue;
+        const filename = filesArr[i][0];
+        imports[filename].namespaces = unique2D(imports[filename].namespaces);
+        const importStrings = getImports(imports[filename].namespaces.filter((i) => filenameFromNamespaces(i) !== filename));
+        if (imports[filename].lifecycleTypes.length > 0) {
+            importStrings.push(`import {${[...new Set(imports[filename].lifecycleTypes)].join(", ")}} from './${visibilityHelperFileName}';`); // unique-ify
+        }
+        const content = `/* eslint-disable */\n\n${autogenerateWarning}${importStrings.join("\n")}${importStrings.length > 0 ? "\n\n" : ""}${filesArr[i][1].value}`;
+        await emitFile(program, {
+            path: resolvePath(options["out-dir"], filename),
+            content: content,
         });
-        // set output for this namespace
-        out.files[n.name.charAt(0).toUpperCase() + n.name.slice(1)] = file;
-        // recursively iterate child namespaces
-        n.namespaces.forEach((ns) => traverseNamespace(ns));
-    };
-    traverseNamespace(namespace);
-    return out;
+    }
 };
-export default emitTypes;
 //# sourceMappingURL=emit_types.js.map

package/dist/src/emit_types.js.map

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

package/dist/src/emitter.d.ts

@@ -1,7 +1,3 @@
 import { EmitContext } from "@typespec/compiler";
-declare global {
-    interface String {
-        addLine(str: string, tabs?: number, continued?: boolean): string;
-    }
-}
-export declare function $onEmit(context: EmitContext): Promise<void>;
+import { EmitterOptions } from "./lib.js";
+export declare function $onEmit(context: EmitContext<EmitterOptions>): Promise<void>;