@osdk/maker 0.9.0-beta.14 → 0.9.0-beta.16

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @osdk/maker
 
+## 0.9.0-beta.16
+
+### Minor Changes
+
+- 0a4f131: Fix value types so they actually serialize correctly.
+- 8e5e49a: Add optional link constraints
+
+### Patch Changes
+
+- Updated dependencies [e5fe7c0]
+  - @osdk/api@2.1.0-beta.16
+
+## 0.9.0-beta.15
+
+### Patch Changes
+
+- @osdk/api@2.1.0-beta.15
+
 ## 0.9.0-beta.14
 
 ### Minor Changes

package/build/browser/api/defineInterfaceLinkConstraint.d.ts

@@ -7,6 +7,7 @@ type Many = {
     toOne?: never;
     displayName?: string;
     description?: string;
+    required?: boolean;
 };
 type One = {
     apiName: string;
@@ -15,6 +16,7 @@ type One = {
     toMany?: never;
     displayName?: string;
     description?: string;
+    required?: boolean;
 };
 export declare function defineInterfaceLinkConstraint(linkDef: One | Many): void;
 export {};

package/build/browser/api/defineInterfaceLinkConstraint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defineInterfaceLinkConstraint.d.ts","sourceRoot":"","sources":["../../../src/api/defineInterfaceLinkConstraint.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,KAAK,sBAAsB,GAAG,MAAM,GAAG,aAAa,CAAC;AAErD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,GAAG,GAAG;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,sBAAsB,CAAC;IAC9B,MAAM,CAAC,EAAE,KAAK,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,GAAG,GAAG,IAAI,QAgBpB"}
+{"version":3,"file":"defineInterfaceLinkConstraint.d.ts","sourceRoot":"","sources":["../../../src/api/defineInterfaceLinkConstraint.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,KAAK,sBAAsB,GAAG,MAAM,GAAG,aAAa,CAAC;AAErD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,sBAAsB,CAAC;IAC/B,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AACF,KAAK,GAAG,GAAG;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,sBAAsB,CAAC;IAC9B,MAAM,CAAC,EAAE,KAAK,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,wBAAgB,6BAA6B,CAC3C,OAAO,EAAE,GAAG,GAAG,IAAI,QAgBpB"}

package/build/browser/api/defineInterfaceLinkConstraint.js

@@ -22,7 +22,7 @@ export function defineInterfaceLinkConstraint(linkDef) {
     cardinality: linkDef.toMany ? "MANY" : "SINGLE",
     linkedEntityTypeId: getLinkedType(linkDef.toMany ?? linkDef.toOne),
     metadata: fromLinkMeta,
-    required: true // TODO: expose this?
+    required: linkDef.required ?? true
   });
 }
 function getLinkedType(t) {

package/build/browser/api/defineInterfaceLinkConstraint.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineInterfaceLinkConstraint.js","names":["invariant","namespace","defineInterfaceLinkConstraint","linkDef","fromLinkMeta","getLinkMeta","from","links","find","a","metadata","apiName","process","env","NODE_ENV","push","cardinality","toMany","linkedEntityTypeId","getLinkedType","toOne","required","t","type","interfaceType","meta","withDefaults","description","displayName"],"sources":["defineInterfaceLinkConstraint.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport invariant from \"tiny-invariant\";\nimport { namespace } from \"./defineOntology.js\";\nexport function defineInterfaceLinkConstraint(linkDef) {\n    const fromLinkMeta = getLinkMeta(linkDef);\n    invariant(linkDef.from.links.find(a => a.metadata.apiName === fromLinkMeta.apiName)\n        == null, `Link with apiName ${fromLinkMeta.apiName} already exists on ${linkDef.apiName}`);\n    linkDef.from.links.push({\n        cardinality: linkDef.toMany ? \"MANY\" : \"SINGLE\",\n        linkedEntityTypeId: getLinkedType(linkDef.toMany ?? linkDef.toOne),\n        metadata: fromLinkMeta,\n        required: true, // TODO: expose this?\n    });\n}\nfunction getLinkedType(t) {\n    return {\n        type: \"interfaceType\",\n        interfaceType: typeof t === \"string\" ? t : t.apiName,\n    };\n}\nfunction getLinkMeta(meta) {\n    return typeof meta === \"string\"\n        ? withDefaults({ apiName: namespace + meta })\n        : withDefaults(meta);\n}\nfunction withDefaults({ apiName, description, displayName }) {\n    return {\n        apiName: namespace + apiName,\n        displayName: displayName ?? apiName,\n        description: description ?? displayName ?? apiName,\n    };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,gBAAgB;AACtC,SAASC,SAAS,QAAQ,qBAAqB;AAC/C,OAAO,SAASC,6BAA6BA,CAACC,OAAO,EAAE;EACnD,MAAMC,YAAY,GAAGC,WAAW,CAACF,OAAO,CAAC;EACzC,EAAUA,OAAO,CAACG,IAAI,CAACC,KAAK,CAACC,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAACC,OAAO,KAAKP,YAAY,CAACO,OAAO,CAAC,IAC5E,IAAI,IAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBADXd,SAAS,QACI,qBAAqBI,YAAY,CAACO,OAAO,sBAAsBR,OAAO,CAACQ,OAAO,EAAE,IAD7FX,SAAS;EAETG,OAAO,CAACG,IAAI,CAACC,KAAK,CAACQ,IAAI,CAAC;IACpBC,WAAW,EAAEb,OAAO,CAACc,MAAM,GAAG,MAAM,GAAG,QAAQ;IAC/CC,kBAAkB,EAAEC,aAAa,CAAChB,OAAO,CAACc,MAAM,IAAId,OAAO,CAACiB,KAAK,CAAC;IAClEV,QAAQ,EAAEN,YAAY;IACtBiB,QAAQ,EAAE,IAAI,CAAE;EACpB,CAAC,CAAC;AACN;AACA,SAASF,aAAaA,CAACG,CAAC,EAAE;EACtB,OAAO;IACHC,IAAI,EAAE,eAAe;IACrBC,aAAa,EAAE,OAAOF,CAAC,KAAK,QAAQ,GAAGA,CAAC,GAAGA,CAAC,CAACX;EACjD,CAAC;AACL;AACA,SAASN,WAAWA,CAACoB,IAAI,EAAE;EACvB,OAAO,OAAOA,IAAI,KAAK,QAAQ,GACzBC,YAAY,CAAC;IAAEf,OAAO,EAAEV,SAAS,GAAGwB;EAAK,CAAC,CAAC,GAC3CC,YAAY,CAACD,IAAI,CAAC;AAC5B;AACA,SAASC,YAAYA,CAAC;EAAEf,OAAO;EAAEgB,WAAW;EAAEC;AAAY,CAAC,EAAE;EACzD,OAAO;IACHjB,OAAO,EAAEV,SAAS,GAAGU,OAAO;IAC5BiB,WAAW,EAAEA,WAAW,IAAIjB,OAAO;IACnCgB,WAAW,EAAEA,WAAW,IAAIC,WAAW,IAAIjB;EAC/C,CAAC;AACL","ignoreList":[]}
+{"version":3,"file":"defineInterfaceLinkConstraint.js","names":["invariant","namespace","defineInterfaceLinkConstraint","linkDef","fromLinkMeta","getLinkMeta","from","links","find","a","metadata","apiName","process","env","NODE_ENV","push","cardinality","toMany","linkedEntityTypeId","getLinkedType","toOne","required","t","type","interfaceType","meta","withDefaults","description","displayName"],"sources":["defineInterfaceLinkConstraint.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport invariant from \"tiny-invariant\";\nimport { namespace } from \"./defineOntology.js\";\nexport function defineInterfaceLinkConstraint(linkDef) {\n    const fromLinkMeta = getLinkMeta(linkDef);\n    invariant(linkDef.from.links.find(a => a.metadata.apiName === fromLinkMeta.apiName)\n        == null, `Link with apiName ${fromLinkMeta.apiName} already exists on ${linkDef.apiName}`);\n    linkDef.from.links.push({\n        cardinality: linkDef.toMany ? \"MANY\" : \"SINGLE\",\n        linkedEntityTypeId: getLinkedType(linkDef.toMany ?? linkDef.toOne),\n        metadata: fromLinkMeta,\n        required: linkDef.required ?? true,\n    });\n}\nfunction getLinkedType(t) {\n    return {\n        type: \"interfaceType\",\n        interfaceType: typeof t === \"string\" ? t : t.apiName,\n    };\n}\nfunction getLinkMeta(meta) {\n    return typeof meta === \"string\"\n        ? withDefaults({ apiName: namespace + meta })\n        : withDefaults(meta);\n}\nfunction withDefaults({ apiName, description, displayName }) {\n    return {\n        apiName: namespace + apiName,\n        displayName: displayName ?? apiName,\n        description: description ?? displayName ?? apiName,\n    };\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,gBAAgB;AACtC,SAASC,SAAS,QAAQ,qBAAqB;AAC/C,OAAO,SAASC,6BAA6BA,CAACC,OAAO,EAAE;EACnD,MAAMC,YAAY,GAAGC,WAAW,CAACF,OAAO,CAAC;EACzC,EAAUA,OAAO,CAACG,IAAI,CAACC,KAAK,CAACC,IAAI,CAACC,CAAC,IAAIA,CAAC,CAACC,QAAQ,CAACC,OAAO,KAAKP,YAAY,CAACO,OAAO,CAAC,IAC5E,IAAI,IAAAC,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBADXd,SAAS,QACI,qBAAqBI,YAAY,CAACO,OAAO,sBAAsBR,OAAO,CAACQ,OAAO,EAAE,IAD7FX,SAAS;EAETG,OAAO,CAACG,IAAI,CAACC,KAAK,CAACQ,IAAI,CAAC;IACpBC,WAAW,EAAEb,OAAO,CAACc,MAAM,GAAG,MAAM,GAAG,QAAQ;IAC/CC,kBAAkB,EAAEC,aAAa,CAAChB,OAAO,CAACc,MAAM,IAAId,OAAO,CAACiB,KAAK,CAAC;IAClEV,QAAQ,EAAEN,YAAY;IACtBiB,QAAQ,EAAElB,OAAO,CAACkB,QAAQ,IAAI;EAClC,CAAC,CAAC;AACN;AACA,SAASF,aAAaA,CAACG,CAAC,EAAE;EACtB,OAAO;IACHC,IAAI,EAAE,eAAe;IACrBC,aAAa,EAAE,OAAOF,CAAC,KAAK,QAAQ,GAAGA,CAAC,GAAGA,CAAC,CAACX;EACjD,CAAC;AACL;AACA,SAASN,WAAWA,CAACoB,IAAI,EAAE;EACvB,OAAO,OAAOA,IAAI,KAAK,QAAQ,GACzBC,YAAY,CAAC;IAAEf,OAAO,EAAEV,SAAS,GAAGwB;EAAK,CAAC,CAAC,GAC3CC,YAAY,CAACD,IAAI,CAAC;AAC5B;AACA,SAASC,YAAYA,CAAC;EAAEf,OAAO;EAAEgB,WAAW;EAAEC;AAAY,CAAC,EAAE;EACzD,OAAO;IACHjB,OAAO,EAAEV,SAAS,GAAGU,OAAO;IAC5BiB,WAAW,EAAEA,WAAW,IAAIjB,OAAO;IACnCgB,WAAW,EAAEA,WAAW,IAAIC,WAAW,IAAIjB;EAC/C,CAAC;AACL","ignoreList":[]}

package/build/browser/api/defineValueType.d.ts

@@ -1,25 +1,16 @@
-import type { BaseType, DataConstraint, FailureMessage } from "@osdk/client.unstable";
-import type { ValueTypeDefinitionVersion } from "./types.js";
-type ZipBaseAndConstraint<Base, Constraint> = {
-    [PropertyType in (BaseType["type"] & DataConstraint["type"])]: Base extends {
-        type: PropertyType;
-    } ? {
-        baseType: Omit<Base, "type">;
-        constraints?: Constraint extends {
-            type: PropertyType;
-        } ? {
-            constraint: Omit<Constraint, "type">;
-            failureMessage?: FailureMessage;
-        }[] : undefined;
-    } : never;
+import type { ValueTypeDefinitionVersion, ValueTypeType } from "./types.js";
+type NewValueTypeDefinitionBacking = {
+    [Type in ValueTypeType as Type["type"]]: {
+        type: Type["value"];
+        constraints?: Type["constraints"];
+    };
 };
-type MappedZip = ZipBaseAndConstraint<BaseType, DataConstraint>;
-type TypeAndConstraints = MappedZip[keyof MappedZip];
+type NewValueTypeDefinition = NewValueTypeDefinitionBacking[keyof NewValueTypeDefinitionBacking];
 export declare function defineValueType(opts: {
     apiName: string;
     displayName: string;
     description?: string;
-    typeAndConstraints: TypeAndConstraints;
+    type: NewValueTypeDefinition;
     version: string;
 }): ValueTypeDefinitionVersion;
 export {};

package/build/browser/api/defineValueType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defineValueType.d.ts","sourceRoot":"","sources":["../../../src/api/defineValueType.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EAEd,cAAc,EACf,MAAM,uBAAuB,CAAC;AAG/B,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAC;AAE7D,KAAK,oBAAoB,CAAC,IAAI,EAAE,UAAU,IAAI;KAC3C,YAAY,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,SACjE;QAAE,IAAI,EAAE,YAAY,CAAA;KAAE,GAAG;QACvB,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC7B,WAAW,CAAC,EAAE,UAAU,SAAS;YAAE,IAAI,EAAE,YAAY,CAAA;SAAE,GAAG;YACtD,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACrC,cAAc,CAAC,EAAE,cAAc,CAAC;SACjC,EAAE,GACD,SAAS,CAAC;KACf,GACC,KAAK;CACV,CAAC;AAEF,KAAK,SAAS,GAAG,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;AAEhE,KAAK,kBAAkB,GAAG,SAAS,CAAC,MAAM,SAAS,CAAC,CAAC;AACrD,wBAAgB,eAAe,CAC7B,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,0BAA0B,CA2C5B"}
+{"version":3,"file":"defineValueType.d.ts","sourceRoot":"","sources":["../../../src/api/defineValueType.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAEV,0BAA0B,EAC1B,aAAa,EACd,MAAM,YAAY,CAAC;AAiCpB,KAAK,6BAA6B,GAAG;KAClC,IAAI,IAAI,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG;QACvC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACpB,WAAW,CAAC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;KACnC;CACF,CAAC;AACF,KAAK,sBAAsB,GACzB,6BAA6B,CAAC,MAAM,6BAA6B,CAAC,CAAC;AA+CrE,wBAAgB,eAAe,CAC7B,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,sBAAsB,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB,GACA,0BAA0B,CAyC5B"}

package/build/browser/api/defineValueType.js

@@ -15,28 +15,74 @@
  */
 import invariant from "tiny-invariant";
 import { ontologyDefinition } from "./defineOntology.js";
+function convertValueTypeTypeToBaseType(valueType) {
+  if (typeof valueType === "string") {}
+  switch (true) {
+    case typeof valueType === "object" && valueType.type === "array":
+      return {
+        type: "array",
+        array: {
+          elementType: convertValueTypeTypeToBaseType(valueType.elementType)
+        }
+      };
+    case typeof valueType === "object" && valueType.type === "struct":
+      return {
+        type: "structV2",
+        structV2: {
+          fields: valueType.fields.map(field => ({
+            identifier: field.identifier,
+            baseType: convertValueTypeTypeToBaseType(field.baseType)
+          }))
+        }
+      };
+    case typeof valueType === "object" && valueType.type === "map":
+      return {
+        type: "map",
+        map: {
+          keyType: convertValueTypeTypeToBaseType(valueType.keyType),
+          valueType: convertValueTypeTypeToBaseType(valueType.valueType)
+        }
+      };
+    case typeof valueType === "object" && valueType.type === "optional":
+      return {
+        type: "optional",
+        optional: {
+          wrappedType: convertValueTypeTypeToBaseType(valueType.wrappedType)
+        }
+      };
+    case typeof valueType === "string":
+      return {
+        type: valueType,
+        [valueType]: {}
+      };
+    default:
+      throw new Error("Invalid ValueTypeType");
+  }
+}
 export function defineValueType(opts) {
   const {
     apiName,
     displayName,
     description,
-    typeAndConstraints,
+    type,
     version
   } = opts;
   !/^((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)$/.test(version) ? process.env.NODE_ENV !== "production" ? invariant(false, "Version is not a valid semver") : invariant(false) : void 0;
+  const typeName = typeof type.type === "string" ? type.type : type.type.type === "struct" ? "structV2" : type.type.type;
   // These suck but TS doesn't understand the relationship from the key of the base type to the type string
-  const constraints = typeAndConstraints.constraints ? typeAndConstraints.constraints.map(constraint => {
-    return {
+  const constraints = type.constraints ? type.constraints.map(constraint => {
+    const output = {
       constraint: {
-        [Object.keys(constraint["constraint"])[0]]: Object.keys(constraint["constraint"])[0],
-        ...constraint
-      }
+        type: typeName,
+        [typeName]: constraint.constraint
+      },
+      failureMessage: constraint.failureMessage
+    };
+    return {
+      constraint: output
     };
   }) : [];
-  const baseType = {
-    [Object.keys(typeAndConstraints.baseType)[0]]: Object.keys(typeAndConstraints.baseType)[0],
-    ...typeAndConstraints.baseType
-  };
+  const baseType = convertValueTypeTypeToBaseType(type.type);
   const vt = {
     apiName,
     displayMetadata: {

package/build/browser/api/defineValueType.js.map

@@ -1 +1 @@
-{"version":3,"file":"defineValueType.js","names":["invariant","ontologyDefinition","defineValueType","opts","apiName","displayName","description","typeAndConstraints","version","test","process","env","NODE_ENV","constraints","map","constraint","Object","keys","baseType","vt","displayMetadata","status","type","active","exampleValues","valueTypes","undefined","push"],"sources":["defineValueType.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport invariant from \"tiny-invariant\";\nimport { ontologyDefinition } from \"./defineOntology.js\";\nexport function defineValueType(opts) {\n    const { apiName, displayName, description, typeAndConstraints, version } = opts;\n    const semverValidation = /^((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)$/;\n    invariant(semverValidation.test(version), \"Version is not a valid semver\");\n    // These suck but TS doesn't understand the relationship from the key of the base type to the type string\n    const constraints = typeAndConstraints.constraints\n        ? typeAndConstraints.constraints.map(constraint => {\n            return {\n                constraint: {\n                    [Object.keys(constraint[\"constraint\"])[0]]: Object.keys(constraint[\"constraint\"])[0],\n                    ...constraint,\n                },\n            };\n        })\n        : [];\n    const baseType = {\n        [Object.keys(typeAndConstraints.baseType)[0]]: Object.keys(typeAndConstraints.baseType)[0],\n        ...typeAndConstraints.baseType,\n    };\n    const vt = {\n        apiName,\n        displayMetadata: {\n            displayName: displayName,\n            description: description ?? \"\",\n        },\n        status: { type: \"active\", active: {} },\n        version: version,\n        baseType: baseType,\n        constraints: constraints,\n        exampleValues: [],\n    };\n    if (ontologyDefinition.valueTypes[apiName] === undefined) {\n        ontologyDefinition.valueTypes[apiName] = [];\n    }\n    ontologyDefinition.valueTypes[apiName].push(vt);\n    return vt;\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAOA,SAAS,MAAM,gBAAgB;AACtC,SAASC,kBAAkB,QAAQ,qBAAqB;AACxD,OAAO,SAASC,eAAeA,CAACC,IAAI,EAAE;EAClC,MAAM;IAAEC,OAAO;IAAEC,WAAW;IAAEC,WAAW;IAAEC,kBAAkB;IAAEC;EAAQ,CAAC,GAAGL,IAAI;EAE/E,CADyB,uHAAuH,CACrHM,IAAI,CAACD,OAAO,CAAC,GAAAE,OAAA,CAAAC,GAAA,CAAAC,QAAA,oBAAxCZ,SAAS,QAAiC,+BAA+B,IAAzEA,SAAS;EACT;EACA,MAAMa,WAAW,GAAGN,kBAAkB,CAACM,WAAW,GAC5CN,kBAAkB,CAACM,WAAW,CAACC,GAAG,CAACC,UAAU,IAAI;IAC/C,OAAO;MACHA,UAAU,EAAE;QACR,CAACC,MAAM,CAACC,IAAI,CAACF,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,GAAGC,MAAM,CAACC,IAAI,CAACF,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;QACpF,GAAGA;MACP;IACJ,CAAC;EACL,CAAC,CAAC,GACA,EAAE;EACR,MAAMG,QAAQ,GAAG;IACb,CAACF,MAAM,CAACC,IAAI,CAACV,kBAAkB,CAACW,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAGF,MAAM,CAACC,IAAI,CAACV,kBAAkB,CAACW,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC1F,GAAGX,kBAAkB,CAACW;EAC1B,CAAC;EACD,MAAMC,EAAE,GAAG;IACPf,OAAO;IACPgB,eAAe,EAAE;MACbf,WAAW,EAAEA,WAAW;MACxBC,WAAW,EAAEA,WAAW,IAAI;IAChC,CAAC;IACDe,MAAM,EAAE;MAAEC,IAAI,EAAE,QAAQ;MAAEC,MAAM,EAAE,CAAC;IAAE,CAAC;IACtCf,OAAO,EAAEA,OAAO;IAChBU,QAAQ,EAAEA,QAAQ;IAClBL,WAAW,EAAEA,WAAW;IACxBW,aAAa,EAAE;EACnB,CAAC;EACD,IAAIvB,kBAAkB,CAACwB,UAAU,CAACrB,OAAO,CAAC,KAAKsB,SAAS,EAAE;IACtDzB,kBAAkB,CAACwB,UAAU,CAACrB,OAAO,CAAC,GAAG,EAAE;EAC/C;EACAH,kBAAkB,CAACwB,UAAU,CAACrB,OAAO,CAAC,CAACuB,IAAI,CAACR,EAAE,CAAC;EAC/C,OAAOA,EAAE;AACb","ignoreList":[]}
+{"version":3,"file":"defineValueType.js","names":["invariant","ontologyDefinition","convertValueTypeTypeToBaseType","valueType","type","array","elementType","structV2","fields","map","field","identifier","baseType","keyType","optional","wrappedType","Error","defineValueType","opts","apiName","displayName","description","version","test","process","env","NODE_ENV","typeName","constraints","constraint","output","failureMessage","vt","displayMetadata","status","active","exampleValues","valueTypes","undefined","push"],"sources":["defineValueType.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport invariant from \"tiny-invariant\";\nimport { ontologyDefinition } from \"./defineOntology.js\";\nfunction convertValueTypeTypeToBaseType(valueType) {\n    if (typeof valueType === \"string\") {\n    }\n    switch (true) {\n        case (typeof valueType === \"object\" && valueType.type === \"array\"):\n            return {\n                type: \"array\",\n                array: {\n                    elementType: convertValueTypeTypeToBaseType(valueType.elementType),\n                },\n            };\n        case (typeof valueType === \"object\" && valueType.type === \"struct\"):\n            return {\n                type: \"structV2\",\n                structV2: {\n                    fields: valueType.fields.map(field => ({\n                        identifier: field.identifier,\n                        baseType: convertValueTypeTypeToBaseType(field.baseType),\n                    })),\n                },\n            };\n        case (typeof valueType === \"object\" && valueType.type === \"map\"):\n            return {\n                type: \"map\",\n                map: {\n                    keyType: convertValueTypeTypeToBaseType(valueType.keyType),\n                    valueType: convertValueTypeTypeToBaseType(valueType.valueType),\n                },\n            };\n        case (typeof valueType === \"object\" && valueType.type === \"optional\"):\n            return {\n                type: \"optional\",\n                optional: {\n                    wrappedType: convertValueTypeTypeToBaseType(valueType.wrappedType),\n                },\n            };\n        case (typeof valueType === \"string\"):\n            return { type: valueType, [valueType]: {} };\n        default:\n            throw new Error(\"Invalid ValueTypeType\");\n    }\n}\nexport function defineValueType(opts) {\n    const { apiName, displayName, description, type, version } = opts;\n    const semverValidation = /^((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)$/;\n    invariant(semverValidation.test(version), \"Version is not a valid semver\");\n    const typeName = typeof type.type === \"string\"\n        ? type.type\n        : type.type.type === \"struct\"\n            ? \"structV2\"\n            : type.type.type;\n    // These suck but TS doesn't understand the relationship from the key of the base type to the type string\n    const constraints = type.constraints\n        ? type.constraints.map(constraint => {\n            const output = {\n                constraint: { type: typeName, [typeName]: constraint.constraint },\n                failureMessage: constraint.failureMessage,\n            };\n            return { constraint: output };\n        })\n        : [];\n    const baseType = convertValueTypeTypeToBaseType(type.type);\n    const vt = {\n        apiName,\n        displayMetadata: {\n            displayName: displayName,\n            description: description ?? \"\",\n        },\n        status: { type: \"active\", active: {} },\n        version: version,\n        baseType: baseType,\n        constraints: constraints,\n        exampleValues: [],\n    };\n    if (ontologyDefinition.valueTypes[apiName] === undefined) {\n        ontologyDefinition.valueTypes[apiName] = [];\n    }\n    ontologyDefinition.valueTypes[apiName].push(vt);\n    return vt;\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/api/overall.test.js

@@ -29,15 +29,11 @@ describe("Ontology Defining", () => {
       expect(() => defineValueType({
         apiName: "apiName",
         displayName: "displayName",
-        typeAndConstraints: {
-          baseType: {
-            boolean: {}
-          },
+        type: {
+          "type": "boolean",
           constraints: [{
             constraint: {
-              boolean: {
-                allowedValues: ["TRUE_VALUE"]
-              }
+              "allowedValues": ["TRUE_VALUE"]
             }
           }]
         },
@@ -48,61 +44,59 @@ describe("Ontology Defining", () => {
       defineValueType({
         apiName: "apiName",
         displayName: "displayName",
-        typeAndConstraints: {
-          baseType: {
-            boolean: {}
-          },
+        type: {
+          "type": "boolean",
           constraints: [{
             constraint: {
-              boolean: {
-                allowedValues: ["TRUE_VALUE"]
-              }
+              "allowedValues": ["TRUE_VALUE"]
             }
           }]
         },
         version: "0.1.0"
       });
       expect(dumpValueTypeWireType()).toMatchInlineSnapshot(`
+ {
+   "valueTypes": [
+     {
+       "metadata": {
+         "apiName": "apiName",
+         "displayMetadata": {
+           "description": "",
+           "displayName": "displayName",
+         },
+         "status": {
+           "active": {},
+           "type": "active",
+         },
+       },
+       "versions": [
          {
-            "valueTypes": [
-              {
-                "metadata": {
-                  "apiName": "apiName",
-                  "displayMetadata": {
-                    "description": "",
-                    "displayName": "displayName",
-                  },
-                  "status": {
-                    "active": {},
-                    "type": "active",
-                  },
-                },
-                "versions": [
-                  {
-                    "baseType": {
-                      "boolean": {},
-                    },
-                    "constraints": [
-                      {
-                        "constraint": {
-                          "boolean": "boolean",
-                          "constraint": {
-                            "boolean": {
-                              "allowedValues": [
-                                "TRUE_VALUE",
-                              ],
-                            },
-                          },
-                        },
-                      },
-                    ],
-                    "exampleValues": [],
-                    "version": "0.1.0",
-                  },
-                ],
-              },
-            ],
-          }
+           "baseType": {
+             "boolean": {},
+             "type": "boolean",
+           },
+           "constraints": [
+             {
+               "constraint": {
+                 "constraint": {
+                   "boolean": {
+                     "allowedValues": [
+                       "TRUE_VALUE",
+                     ],
+                   },
+                   "type": "boolean",
+                 },
+                 "failureMessage": undefined,
+               },
+             },
+           ],
+           "exampleValues": [],
+           "version": "0.1.0",
+         },
+       ],
+     },
+   ],
+ }
         `);
     });
     defineOntology("com.palantir.", () => {});