@osdk/generator 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @osdk/generator
 
+## 1.0.3
+
+### Patch Changes
+
+- 52ff84a8: Fix 2.0 OSDK generation for ontologies with no objects in them"
+- 693478bd: Alphabetize property names when generating object definitions
+
 ## 1.0.2
 
 ### Patch Changes

package/build/js/index.cjs

@@ -1020,7 +1020,7 @@ ${Array.from(uniqueLinkTargets).map((linkTarget) => `import type { ${linkTarget}
   ${getDescriptionIfPresent(objectTypeWithLinks.objectType.description)}export interface ${objectTypeWithLinks.objectType.apiName} extends OntologyObject {
   readonly __apiName: "${objectTypeWithLinks.objectType.apiName}";
   readonly __primaryKey: ${wirePropertyTypeV2ToTypeScriptType(objectTypeWithLinks.objectType.properties[objectTypeWithLinks.objectType.primaryKey].dataType)};
-${Object.entries(objectTypeWithLinks.objectType.properties).flatMap(([propertyName, propertyDefinition]) => {
+${Object.entries(objectTypeWithLinks.objectType.properties).sort((a, b) => a[0].localeCompare(b[0])).flatMap(([propertyName, propertyDefinition]) => {
     const propertyType = wirePropertyTypeV2ToTypeScriptType(propertyDefinition.dataType);
     const entries = [`${getDescriptionIfPresent(propertyDefinition.description)}readonly ${propertyName}: ${propertyType} | undefined`];
     if (isReservedKeyword(propertyName)) {
@@ -1092,7 +1092,7 @@ async function generatePerObjectInterfaceAndDataFiles(ontology, fs, outDir, impo
   await Promise.all(Object.values(ontology.objectTypes).map(async (object) => {
     object.linkTypes;
     await fs.writeFile(path15__namespace.default.join(outDir, `${object.objectType.apiName}.ts`), await formatTs(`
-        import { ObjectTypeDefinition } from "@osdk/api";
+        import type { ObjectTypeDefinition } from "@osdk/api";
         ${wireObjectTypeV2ToObjectInterfaceStringV1(object)}
 
         ${wireObjectTypeV2ToSdkObjectConst(object)}
@@ -1554,7 +1554,7 @@ async function generateClientSdkVersionTwoPointZero(ontology, fs, outDir, packag
   }).join(",\n")}
               
         }
-      } satisfies OntologyDefinition<${objectNames.map((n) => `"${n}"`).join("|")}>;
+      } satisfies OntologyDefinition<${stringUnionFrom2(objectNames)}>;
 
       type _Ontology = typeof _Ontology;
       export interface Ontology extends _Ontology {}
@@ -1589,6 +1589,13 @@ async function generateClientSdkVersionTwoPointZero(ontology, fs, outDir, packag
     ${Object.keys(ontology.objectTypes).map((apiName) => `export * from "./objects/${apiName}${importExt}";`).join("\n")}
     `));
 }
+function stringUnionFrom2(values) {
+  if (values.length === 0) {
+    return "never";
+  } else {
+    return values.map((v) => `"${v}"`).join("|");
+  }
+}
 async function generateOntologyInterfaces(fs, outDir, interfaceNames, ontology, importExt) {
   const interfacesDir = path15__namespace.default.join(outDir, "ontology", "interfaces");
   await fs.mkdir(interfacesDir, {