@party-stack/ontology 0.3.0 → 0.4.0

package/lib/OntologyConfig.d.ts

@@ -1,11 +1,12 @@
-import type { OntologyAdapter } from "./live/OntologyAdapter.js";
+import type { OntologyBackendAdapter } from "./live/OntologyBackendAdapter.js";
 export interface OntologyConfigAdapter<Opts = unknown> {
-    createAdapter: (opts: Opts) => OntologyAdapter | Promise<OntologyAdapter>;
+    createAdapter: (opts: Opts) => OntologyBackendAdapter | Promise<OntologyBackendAdapter>;
 }
 export interface OntologyConfig<Opts = unknown> {
     adapter: OntologyConfigAdapter<Opts>;
     objectTypeNames: string[];
     actionTypeNames: string[];
+    queryFunctionTypeNames?: string[];
     opts?: Opts;
 }
 //# sourceMappingURL=OntologyConfig.d.ts.map

package/lib/OntologyConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OntologyConfig.d.ts","sourceRoot":"","sources":["../src/OntologyConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,WAAW,qBAAqB,CAAC,IAAI,GAAG,OAAO;IACjD,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;CAC7E;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,GAAG,OAAO;IAC1C,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,IAAI,CAAC,EAAE,IAAI,CAAC;CACf"}
+{"version":3,"file":"OntologyConfig.d.ts","sourceRoot":"","sources":["../src/OntologyConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAE/E,MAAM,WAAW,qBAAqB,CAAC,IAAI,GAAG,OAAO;IACjD,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;CAC3F;AAED,MAAM,WAAW,cAAc,CAAC,IAAI,GAAG,OAAO;IAC1C,OAAO,EAAE,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACrC,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,sBAAsB,CAAC,EAAE,MAAM,EAAE,CAAC;IAClC,IAAI,CAAC,EAAE,IAAI,CAAC;CACf"}

package/lib/cli/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/cli/generate.ts"],"names":[],"mappings":";AAwBA,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAaD,wBAAsB,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoD7E"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/cli/generate.ts"],"names":[],"mappings":";AAwBA,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AA8DD,wBAAsB,aAAa,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmE7E"}

package/lib/cli/generate.js

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
-import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, extname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { pascalCase } from "change-case";
-import { Command } from "commander";
 import { createJiti } from "jiti";
 import { format, resolveConfig } from "prettier";
+import { generateBuilders } from "../generate/builders.js";
 import { generateLive } from "../generate/live.js";
-import { generateTypes } from "../generate/types.js";
+import { generateTypeDefinitions, generateTypes } from "../generate/types.js";
 function toModuleSpecifier(path) {
     const normalized = path.replaceAll("\\", "/");
     if (normalized.startsWith(".")) {
@@ -27,6 +27,44 @@ function readPackageName(cwd) {
         return null;
     }
 }
+function formatImportSpecifier(path, jsExtensions) {
+    const specifier = toModuleSpecifier(path);
+    if (jsExtensions) {
+        return specifier.replace(/\.[cm]?tsx?$/, ".js");
+    }
+    return maybeStripJsExtension(specifier, false);
+}
+function maybeStripJsExtension(specifier, jsExtensions) {
+    if (jsExtensions || !specifier.startsWith(".")) {
+        return specifier;
+    }
+    return specifier.replace(/\.(?:[cm]?jsx?|[cm]?tsx?)$/, "");
+}
+function resolveValuesImportPath(outDir) {
+    const ontologyPackageRoot = fileURLToPath(new URL("../../", import.meta.url));
+    if (!resolve(outDir).startsWith(resolve(ontologyPackageRoot))) {
+        return "@party-stack/ontology/values";
+    }
+    const workspaceValuesPath = fileURLToPath(new URL("../../src/utils/values.ts", import.meta.url));
+    if (!existsSync(workspaceValuesPath)) {
+        return "@party-stack/ontology/values";
+    }
+    return formatImportSpecifier(relative(outDir, workspaceValuesPath), true);
+}
+async function formatAndWrite(filePath, content, prettierConfig) {
+    const header = "// Auto-generated file - do not edit manually\n\n";
+    const formatted = await format(header + content, {
+        ...prettierConfig,
+        filepath: filePath,
+    });
+    writeFileSync(filePath, formatted, "utf-8");
+}
+function isTypeOnlyOntology(ontology) {
+    return (ontology.objectTypes.length === 0 &&
+        ontology.linkTypes.length === 0 &&
+        ontology.actionTypes.length === 0 &&
+        ontology.queryFunctionTypes.length === 0);
+}
 export async function generateFiles(options) {
     const ontologyPath = resolve(process.cwd(), options.ontology);
     const outDir = resolve(process.cwd(), options.outDir);
@@ -36,6 +74,26 @@ export async function generateFiles(options) {
     if (!ontology || !Array.isArray(ontology.types) || !Array.isArray(ontology.objectTypes)) {
         throw new Error(`Ontology export from "${options.ontology}" must be an OntologyIR value`);
     }
+    mkdirSync(outDir, { recursive: true });
+    const prettierConfig = await resolveConfig(outDir);
+    if (isTypeOnlyOntology(ontology)) {
+        const typesFilePath = join(outDir, "types.ts");
+        const buildersFilePath = join(outDir, "builders.ts");
+        const typesOutput = generateTypeDefinitions(ontology, {
+            valuesImportPath: resolveValuesImportPath(outDir),
+        });
+        const buildersOutput = generateBuilders(ontology, {
+            exportName: "o",
+            promoted: "TypeDef",
+        });
+        await Promise.all([
+            formatAndWrite(typesFilePath, typesOutput, prettierConfig),
+            formatAndWrite(buildersFilePath, buildersOutput, prettierConfig),
+        ]);
+        console.log(`Generated types written to: ${typesFilePath}`);
+        console.log(`Generated builders written to: ${buildersFilePath}`);
+        return;
+    }
     const ontologyFileName = basename(ontologyPath, extname(ontologyPath));
     const slug = ontologyFileName === "ontology" ? basename(dirname(ontologyPath)) : ontologyFileName;
     const namespace = options.namespace ?? pascalCase(slug);
@@ -53,53 +111,13 @@ export async function generateFiles(options) {
         ontologyTypeName: generatedOntologyTypeName,
         outputFactoryName: `create${namespace}LiveOntology`,
     });
-    mkdirSync(outDir, { recursive: true });
     const typesFilePath = join(outDir, "types.ts");
     const liveFilePath = join(outDir, "live.ts");
-    const header = "// Auto-generated file - do not edit manually\n\n";
-    const prettierConfig = await resolveConfig(outDir);
-    const formatAndWrite = async (filePath, content) => {
-        const formatted = await format(header + content, {
-            ...prettierConfig,
-            filepath: filePath,
-        });
-        writeFileSync(filePath, formatted, "utf-8");
-    };
-    await Promise.all([formatAndWrite(typesFilePath, typesOutput), formatAndWrite(liveFilePath, liveOutput)]);
+    await Promise.all([
+        formatAndWrite(typesFilePath, typesOutput, prettierConfig),
+        formatAndWrite(liveFilePath, liveOutput, prettierConfig),
+    ]);
     console.log(`Generated types written to: ${typesFilePath}`);
     console.log(`Generated live helpers written to: ${liveFilePath}`);
 }
-function formatImportSpecifier(path, jsExtensions) {
-    const specifier = toModuleSpecifier(path);
-    if (jsExtensions) {
-        return specifier.replace(/\.[cm]?tsx?$/, ".js");
-    }
-    return maybeStripJsExtension(specifier, false);
-}
-function maybeStripJsExtension(specifier, jsExtensions) {
-    if (jsExtensions || !specifier.startsWith(".")) {
-        return specifier;
-    }
-    return specifier.replace(/\.(?:[cm]?jsx?|[cm]?tsx?)$/, "");
-}
-const program = new Command();
-program
-    .name("generate")
-    .description("Generate ontology types and live helpers from an OntologyIR file")
-    .requiredOption("--ontology <path>", "Path to the ontology module (must export an OntologyIR)")
-    .requiredOption("--outDir <path>", "Directory to write generated files")
-    .option("--namespace <name>", "Namespace for generated ontology types/factories")
-    .option("--no-js-extensions", "Omit .js extensions from generated relative imports")
-    .action(async (options) => {
-    try {
-        await generateFiles(options);
-    }
-    catch (error) {
-        console.error(error instanceof Error ? error.message : String(error));
-        process.exit(1);
-    }
-});
-if (process.argv[1] && resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
-    program.parse();
-}
 //# sourceMappingURL=generate.js.map

package/lib/cli/generate.js.map

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

package/lib/cli/index.js

@@ -30,13 +30,16 @@ async function main() {
     program.name("ontology").description("Generate and pull ontology files");
     program
         .command("generate")
-        .description("Generate typed live ontology helpers from src/ontology/ontology.ts")
+        .description("Generate ontology types, builders, and live helpers")
+        .option("--ontology <path>", "Path to the ontology module", ontologyPath)
+        .option("--outDir <path>", "Directory to write generated files", generatedDir)
+        .option("--namespace <name>", "Namespace for generated ontology types/factories")
         .option("--no-js-extensions", "Omit .js extensions from generated relative imports")
         .action(async (options) => {
         await generateFiles({
-            ontology: ontologyPath,
-            outDir: generatedDir,
-            namespace: readPackageNamespace(cwd),
+            ontology: resolve(cwd, options.ontology),
+            outDir: resolve(cwd, options.outDir),
+            namespace: options.namespace ?? readPackageNamespace(cwd),
             jsExtensions: options.jsExtensions,
         });
     });

package/lib/cli/index.js.map

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

package/lib/cli/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/cli/pull.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAIlF,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAC7D,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AAuB3D,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGrE;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAYpF;AAED,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,kBAAkB,SAA0B,GAC7C,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/cli/pull.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAIlF,eAAO,MAAM,oBAAoB,2BAA2B,CAAC;AAC7D,eAAO,MAAM,gBAAgB,6BAA6B,CAAC;AA0B3D,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGrE;AAED,wBAAsB,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAYpF;AAED,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,EACf,kBAAkB,SAA0B,GAC7C,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/lib/cli/pull.js

@@ -4,8 +4,8 @@ import nextEnv from "@next/env";
 import { createJiti } from "jiti";
 import { format, resolveConfig } from "prettier";
 import { generateOntology } from "../generate/ontology.js";
+import { createMetaLiveOntology } from "../meta/generated/live.js";
 import { pull } from "../meta/pull.js";
-import { createMetaLiveOntology } from "../ontology/generated/live.js";
 const { loadEnvConfig } = nextEnv;
 export const ONTOLOGY_CONFIG_PATH = "src/ontology/config.ts";
 export const ONTOLOGY_IR_PATH = "src/ontology/ontology.ts";
@@ -21,7 +21,10 @@ function isOntologyConfig(value) {
         Array.isArray(value.objectTypeNames) &&
         value.objectTypeNames.every((entry) => typeof entry === "string") &&
         Array.isArray(value.actionTypeNames) &&
-        value.actionTypeNames.every((entry) => typeof entry === "string"));
+        value.actionTypeNames.every((entry) => typeof entry === "string") &&
+        (value.queryFunctionTypeNames === undefined ||
+            (Array.isArray(value.queryFunctionTypeNames) &&
+                value.queryFunctionTypeNames.every((entry) => typeof entry === "string"))));
 }
 export function discoverOntologyConfigPath(cwd) {
     const configPath = resolve(cwd, ONTOLOGY_CONFIG_PATH);
@@ -38,12 +41,15 @@ export async function loadOntologyConfig(configPath) {
     return config;
 }
 export async function writePulledOntology(config, outPath, ontologyImportPath = "@party-stack/ontology") {
-    const adapter = await config.adapter.createAdapter(config.opts);
-    const liveOntology = createMetaLiveOntology(adapter);
+    const backendAdapter = await config.adapter.createAdapter(config.opts);
+    const liveOntology = await createMetaLiveOntology({
+        backend: () => backendAdapter,
+    });
     try {
         const ontology = await pull(liveOntology, {
             objectTypeNames: config.objectTypeNames,
             actionTypeNames: config.actionTypeNames,
+            queryFunctionTypeNames: config.queryFunctionTypeNames ?? [],
         });
         const output = generateOntology(ontology, { ontologyImportPath });
         mkdirSync(dirname(outPath), { recursive: true });

package/lib/cli/pull.js.map

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

package/lib/examples/blog.d.ts

@@ -15,7 +15,49 @@ declare const _default: {
         description: string;
         type: {
             kind: "struct";
-            value: import("../ir/generated/types.js").StructTypeDef;
+            value: {
+                readonly fields: [{
+                    readonly name: "line1";
+                    readonly displayName: "Line 1";
+                    readonly type: {
+                        kind: "string";
+                        value: {};
+                    };
+                }, {
+                    readonly name: "line2";
+                    readonly displayName: "Line 2";
+                    readonly type: {
+                        kind: "optional";
+                        value: {
+                            readonly type: {
+                                kind: "string";
+                                value: {};
+                            };
+                        };
+                    };
+                }, {
+                    readonly name: "city";
+                    readonly displayName: "City";
+                    readonly type: {
+                        kind: "string";
+                        value: {};
+                    };
+                }, {
+                    readonly name: "state";
+                    readonly displayName: "State";
+                    readonly type: {
+                        kind: "string";
+                        value: {};
+                    };
+                }, {
+                    readonly name: "zip";
+                    readonly displayName: "ZIP";
+                    readonly type: {
+                        kind: "string";
+                        value: {};
+                    };
+                }];
+            };
         };
     }[];
     objectTypes: ({
@@ -29,7 +71,7 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "string";
-                value: import("../ir/generated/types.js").StringTypeDef;
+                value: {};
             };
             description?: undefined;
         } | {
@@ -37,7 +79,12 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "optional";
-                value: import("../ir/generated/types.js").OptionalTypeDef;
+                value: {
+                    readonly type: {
+                        kind: "string";
+                        value: {};
+                    };
+                };
             };
             description?: undefined;
         } | {
@@ -46,14 +93,34 @@ declare const _default: {
             description: string;
             type: {
                 kind: "optional";
-                value: import("../ir/generated/types.js").OptionalTypeDef;
+                value: {
+                    readonly type: {
+                        kind: "attachment";
+                        value: {};
+                    };
+                };
             };
+        } | {
+            name: string;
+            displayName: string;
+            type: {
+                kind: "optional";
+                value: {
+                    readonly type: {
+                        kind: "ref";
+                        value: {
+                            readonly name: "Address";
+                        };
+                    };
+                };
+            };
+            description?: undefined;
         } | {
             name: string;
             displayName: string;
             type: {
                 kind: "timestamp";
-                value: import("../ir/generated/types.js").TimestampTypeDef;
+                value: {};
             };
             description?: undefined;
         })[];
@@ -68,28 +135,50 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "string";
-                value: import("../ir/generated/types.js").StringTypeDef;
+                value: {};
             };
         } | {
             name: string;
             displayName: string;
             type: {
                 kind: "optional";
-                value: import("../ir/generated/types.js").OptionalTypeDef;
+                value: {
+                    readonly type: {
+                        kind: "attachment";
+                        value: {};
+                    };
+                };
             };
         } | {
             name: string;
             displayName: string;
             type: {
                 kind: "list";
-                value: import("../ir/generated/types.js").ListTypeDef;
+                value: {
+                    readonly elementType: {
+                        kind: "string";
+                        value: {};
+                    };
+                };
             };
         } | {
             name: string;
             displayName: string;
             type: {
                 kind: "timestamp";
-                value: import("../ir/generated/types.js").TimestampTypeDef;
+                value: {};
+            };
+        } | {
+            name: string;
+            displayName: string;
+            type: {
+                kind: "optional";
+                value: {
+                    readonly type: {
+                        kind: "timestamp";
+                        value: {};
+                    };
+                };
             };
         })[];
     })[];
@@ -131,18 +220,23 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "string";
-                value: import("../ir/generated/types.js").StringTypeDef;
+                value: {};
             };
             defaultValue: {
                 kind: "functionCall";
-                value: import("../ir/generated/types.js").FunctionCallExpression;
+                value: {
+                    kind: "uuid";
+                    value: {};
+                };
             };
         } | {
             name: string;
             displayName: string;
             type: {
                 kind: "objectReference";
-                value: import("../ir/generated/types.js").ObjectReferenceTypeDef;
+                value: {
+                    readonly objectType: "Author";
+                };
             };
             defaultValue?: undefined;
         } | {
@@ -150,7 +244,7 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "string";
-                value: import("../ir/generated/types.js").StringTypeDef;
+                value: {};
             };
             defaultValue?: undefined;
         } | {
@@ -158,7 +252,12 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "list";
-                value: import("../ir/generated/types.js").ListTypeDef;
+                value: {
+                    readonly elementType: {
+                        kind: "string";
+                        value: {};
+                    };
+                };
             };
             defaultValue?: undefined;
         } | {
@@ -166,18 +265,116 @@ declare const _default: {
             displayName: string;
             type: {
                 kind: "timestamp";
-                value: import("../ir/generated/types.js").TimestampTypeDef;
+                value: {};
             };
             defaultValue: {
                 kind: "functionCall";
-                value: import("../ir/generated/types.js").FunctionCallExpression;
+                value: {
+                    kind: "now";
+                    value: {};
+                };
             };
         })[];
         logic: {
             kind: "createObject";
-            value: import("../ir/generated/types.js").CreateObjectActionLogicStep;
+            value: {
+                readonly objectType: "Post";
+                readonly values: [{
+                    readonly property: ["postId"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["postId"];
+                        };
+                    };
+                }, {
+                    readonly property: ["title"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["title"];
+                        };
+                    };
+                }, {
+                    readonly property: ["body"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["body"];
+                        };
+                    };
+                }, {
+                    readonly property: ["authorId"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["author", "authorId"];
+                        };
+                    };
+                }, {
+                    readonly property: ["status"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["status"];
+                        };
+                    };
+                }, {
+                    readonly property: ["tags"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["tags"];
+                        };
+                    };
+                }, {
+                    readonly property: ["createdAt"];
+                    readonly value: {
+                        kind: "valueReference";
+                        value: {
+                            readonly path: ["createdAt"];
+                        };
+                    };
+                }];
+            };
         }[];
     }[];
+    queryFunctionTypes: {
+        name: string;
+        displayName: string;
+        description: string;
+        parameters: ({
+            name: string;
+            displayName: string;
+            type: {
+                kind: "string";
+                value: {};
+            };
+        } | {
+            name: string;
+            displayName: string;
+            type: {
+                kind: "optional";
+                value: {
+                    readonly type: {
+                        kind: "integer";
+                        value: {};
+                    };
+                };
+            };
+        })[];
+        returnType: {
+            kind: "list";
+            value: {
+                readonly elementType: {
+                    kind: "objectReference";
+                    value: {
+                        readonly objectType: "Post";
+                    };
+                };
+            };
+        };
+    }[];
 };
 export default _default;
 //# sourceMappingURL=blog.d.ts.map

package/lib/examples/blog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blog.d.ts","sourceRoot":"","sources":["../../src/examples/blog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKH,wBA6SuB"}
+{"version":3,"file":"blog.d.ts","sourceRoot":"","sources":["../../src/examples/blog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKH,wBAiUuB"}