@osdk/maker 0.14.0-beta.9 → 0.15.0-beta.1

package/build/cjs/index.cjs

@@ -9,6 +9,8 @@ var invariant7 = require('tiny-invariant');
 var yargs = require('yargs');
 var helpers = require('yargs/helpers');
 var fs2 = require('fs');
+var typescriptSdkDocs = require('@osdk/typescript-sdk-docs');
+var Mustache = require('mustache');
 var crypto = require('crypto');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -36,6 +38,7 @@ var path3__namespace = /*#__PURE__*/_interopNamespace(path3);
 var invariant7__default = /*#__PURE__*/_interopDefault(invariant7);
 var yargs__default = /*#__PURE__*/_interopDefault(yargs);
 var fs2__namespace = /*#__PURE__*/_interopNamespace(fs2);
+var Mustache__default = /*#__PURE__*/_interopDefault(Mustache);
 
 // src/cli/main.ts
 
@@ -343,7 +346,7 @@ function defineObject(objectDef) {
     const allFailedValidations = validations.concat(nonExistentInterfaceProperties).filter((val) => val.type === "invalid");
     !(allFailedValidations.length === 0) ? process.env.NODE_ENV !== "production" ? invariant7__default.default(false, "\n" + allFailedValidations.map(formatValidationErrors).join("\n")) : invariant7__default.default(false) : void 0;
   });
-  const flattenedProperties = Object.entries(objectDef.properties ?? {}).map(([apiName2, property]) => convertUserObjectPropertyType(property.apiName ?? apiName2, property));
+  const flattenedProperties = Object.entries(objectDef.properties ?? {}).map(([apiName2, property]) => convertUserObjectPropertyType(apiName2, property));
   const finalObject = {
     ...objectDef,
     apiName,
@@ -383,7 +386,6 @@ function convertToPluralDisplayName(s) {
   return s === void 0 || s == null ? "" : s.endsWith("s") ? uppercaseFirstLetter(s) : uppercaseFirstLetter(s) + "s";
 }
 function convertUserObjectPropertyType(apiName, property) {
-  property.apiName = apiName;
   property.displayName = property.displayName ?? uppercaseFirstLetter(apiName);
   return {
     ...property,
@@ -782,14 +784,14 @@ function distributeTypeHelper(type) {
 // src/conversion/toMarketplace/propertyTypeTypeToOntologyIrType.ts
 function propertyTypeTypeToOntologyIrType(type) {
   switch (true) {
-    case (typeof type === "object" && "markingType" in type):
+    case (typeof type === "object" && type.type === "marking"):
       return {
         "type": "marking",
         marking: {
           markingType: type.markingType
         }
       };
-    case (typeof type === "object" && "structDefinition" in type):
+    case (typeof type === "object" && type.type === "struct"):
       const structFields = new Array();
       for (const key in type.structDefinition) {
         const fieldTypeDefinition = type.structDefinition[key];
@@ -835,15 +837,24 @@ function propertyTypeTypeToOntologyIrType(type) {
           structFields
         }
       };
-    case (typeof type === "object" && "isLongText" in type):
+    case (typeof type === "object" && type.type === "string"):
       return {
         "type": "string",
         "string": {
           analyzerOverride: void 0,
-          enableAsciiFolding: void 0,
-          isLongText: type.isLongText,
-          supportsEfficientLeadingWildcard: type.supportsEfficientLeadingWildcard,
-          supportsExactMatching: type.supportsExactMatching
+          enableAsciiFolding: type.enableAsciiFolding,
+          isLongText: type.isLongText ?? false,
+          supportsEfficientLeadingWildcard: type.supportsEfficientLeadingWildcard ?? false,
+          supportsExactMatching: type.supportsExactMatching ?? true,
+          supportsFullTextRegex: type.supportsFullTextRegex
+        }
+      };
+    case (typeof type === "object" && type.type === "decimal"):
+      return {
+        "type": "decimal",
+        "decimal": {
+          precision: type.precision,
+          scale: type.scale
         }
       };
     case type === "geopoint":
@@ -881,6 +892,9 @@ function propertyTypeTypeToOntologyIrType(type) {
         geotimeSeriesReference: {}
       };
     default:
+      if (typeof type === "object") {
+        throw new Error(`Unhandled exotic type: ${JSON.stringify(type)}`);
+      }
       return distributeTypeHelper(type);
   }
 }
@@ -1443,1139 +1457,6 @@ function getFormContentOrdering(action, parameterOrdering) {
   return formContentOrdering;
 }
 
-// ../../node_modules/.pnpm/outdent@0.8.0/node_modules/outdent/lib-module/index.js
-function noop() {
-}
-function createWeakMap() {
-  if (typeof WeakMap !== "undefined") {
-    return /* @__PURE__ */ new WeakMap();
-  } else {
-    return fakeSetOrMap();
-  }
-}
-function fakeSetOrMap() {
-  return {
-    add: noop,
-    delete: noop,
-    get: noop,
-    set: noop,
-    has: function(k) {
-      return false;
-    }
-  };
-}
-var hop = Object.prototype.hasOwnProperty;
-var has = function(obj, prop) {
-  return hop.call(obj, prop);
-};
-function extend(target, source) {
-  for (var prop in source) {
-    if (has(source, prop)) {
-      target[prop] = source[prop];
-    }
-  }
-  return target;
-}
-var reLeadingNewline = /^[ \t]*(?:\r\n|\r|\n)/;
-var reTrailingNewline = /(?:\r\n|\r|\n)[ \t]*$/;
-var reStartsWithNewlineOrIsEmpty = /^(?:[\r\n]|$)/;
-var reDetectIndentation = /(?:\r\n|\r|\n)([ \t]*)(?:[^ \t\r\n]|$)/;
-var reOnlyWhitespaceWithAtLeastOneNewline = /^[ \t]*[\r\n][ \t\r\n]*$/;
-function _outdentArray(strings, firstInterpolatedValueSetsIndentationLevel, options) {
-  var indentationLevel = 0;
-  var match = strings[0].match(reDetectIndentation);
-  if (match) {
-    indentationLevel = match[1].length;
-  }
-  var reSource = "(\\r\\n|\\r|\\n).{0," + indentationLevel + "}";
-  var reMatchIndent = new RegExp(reSource, "g");
-  if (firstInterpolatedValueSetsIndentationLevel) {
-    strings = strings.slice(1);
-  }
-  var newline = options.newline, trimLeadingNewline = options.trimLeadingNewline, trimTrailingNewline = options.trimTrailingNewline;
-  var normalizeNewlines = typeof newline === "string";
-  var l = strings.length;
-  var outdentedStrings = strings.map(function(v, i) {
-    v = v.replace(reMatchIndent, "$1");
-    if (i === 0 && trimLeadingNewline) {
-      v = v.replace(reLeadingNewline, "");
-    }
-    if (i === l - 1 && trimTrailingNewline) {
-      v = v.replace(reTrailingNewline, "");
-    }
-    if (normalizeNewlines) {
-      v = v.replace(/\r\n|\n|\r/g, function(_) {
-        return newline;
-      });
-    }
-    return v;
-  });
-  return outdentedStrings;
-}
-function concatStringsAndValues(strings, values) {
-  var ret = "";
-  for (var i = 0, l = strings.length; i < l; i++) {
-    ret += strings[i];
-    if (i < l - 1) {
-      ret += values[i];
-    }
-  }
-  return ret;
-}
-function isTemplateStringsArray(v) {
-  return has(v, "raw") && has(v, "length");
-}
-function createInstance(options) {
-  var arrayAutoIndentCache = createWeakMap();
-  var arrayFirstInterpSetsIndentCache = createWeakMap();
-  function outdent(stringsOrOptions) {
-    var values = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-      values[_i - 1] = arguments[_i];
-    }
-    if (isTemplateStringsArray(stringsOrOptions)) {
-      var strings = stringsOrOptions;
-      var firstInterpolatedValueSetsIndentationLevel = (values[0] === outdent || values[0] === defaultOutdent) && reOnlyWhitespaceWithAtLeastOneNewline.test(strings[0]) && reStartsWithNewlineOrIsEmpty.test(strings[1]);
-      var cache = firstInterpolatedValueSetsIndentationLevel ? arrayFirstInterpSetsIndentCache : arrayAutoIndentCache;
-      var renderedArray = cache.get(strings);
-      if (!renderedArray) {
-        renderedArray = _outdentArray(strings, firstInterpolatedValueSetsIndentationLevel, options);
-        cache.set(strings, renderedArray);
-      }
-      if (values.length === 0) {
-        return renderedArray[0];
-      }
-      var rendered = concatStringsAndValues(renderedArray, firstInterpolatedValueSetsIndentationLevel ? values.slice(1) : values);
-      return rendered;
-    } else {
-      return createInstance(extend(extend({}, options), stringsOrOptions || {}));
-    }
-  }
-  var fullOutdent = extend(outdent, {
-    string: function(str) {
-      return _outdentArray([str], false, options)[0];
-    }
-  });
-  return fullOutdent;
-}
-var defaultOutdent = createInstance({
-  trimLeadingNewline: true,
-  trimTrailingNewline: true
-});
-if (typeof module !== "undefined") {
-  try {
-    module.exports = defaultOutdent;
-    Object.defineProperty(defaultOutdent, "__esModule", {
-      value: true
-    });
-    defaultOutdent.default = defaultOutdent;
-    defaultOutdent.outdent = defaultOutdent;
-  } catch (e) {
-  }
-}
-
-// ../../node_modules/.pnpm/@osdk+typescript-sdk-docs@0.2.0/node_modules/@osdk/typescript-sdk-docs/build/esm/generatedNoCheck/docsNoComputedVariables.js
-var snippets = {
-  "kind": "sdk",
-  "versions": {
-    "1.0.0": {
-      "snippets": {
-        "loadSingleObjectGuide": [{
-          "template": 'import { type GetObjectError, isOk, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst result: Result<{{objectType}}, GetObjectError> = await client.ontology.objects.{{objectType}}.get("primaryKey");\nif (isOk(result)) {\n    const object: {{objectType}} = result.value;\n} else {\n    console.error(result.error.errorType);\n}'
-        }],
-        "loadObjectPageGuide": [{
-          "template": 'import { isOk, type LoadObjectSetError, Page, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst firstPage: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}.page({ pageSize: 30 });\n\nif (isOk(firstPage)) {\n    const secondPage: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}\n        .page({ pageSize: 30, pageToken: firstPage.value.nextPageToken });\n\n    const objects = isOk(secondPage) ? [...firstPage.value.data, ...secondPage.value.data] : firstPage.value.data;\n    const object = objects[0];\n}'
-        }],
-        "orderObjectsGuide": [{
-          "template": 'import { isOk, Page, type Result, type SearchObjectsError } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst page: Result<Page<{{objectType}}>, SearchObjectsError> = await client.ontology.objects.{{objectType}}\n    .orderBy(sortBy => sortBy.{{titleProperty}}.asc())\n    .page({ pageSize: 30 });\n\nif (isOk(page)) {\n    const objects = page.value.data;\n    const object = objects[0];\n}'
-        }],
-        "searchObjectsGuide": [{
-          "template": 'import { isOk, type LoadObjectSetError, Page, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst page: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}\n    .where(query => query.{{titleProperty}}.isNull())\n    .page({ pageSize: 30 });\n\nif (isOk(page)) {\n    const objects = page.value.data;\n    const object = objects[0];\n}'
-        }],
-        "loadSingleObjectReference": [{
-          "template": 'import { type GetObjectError, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst response: Result<{{objectType}}, GetObjectError> = await client.ontology.objects.{{objectType}}.get("primaryKey");'
-        }],
-        "loadObjectsReference": [{
-          "template": 'import { type LoadObjectSetError, Page, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst response: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}\n    .page({ pageSize: 30 });'
-        }],
-        "loadAllObjectsReference": [{
-          "template": 'import { isOk, type LoadObjectSetError, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst objects: Result<{{objectType}}[], LoadObjectSetError> = await client.ontology.objects.{{objectType}}.all();\n\nif (isOk(objects)) {\n    const object = objects.value[0];\n}'
-        }],
-        "loadLinkedObjectReference": [{
-          "template": 'import { type GetLinkedObjectError, type Result } from "{{{packageName}}}";\nimport { {{sourceObjectType}}, {{linkedObjectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getLinked{{linkedObjectType}}(source: {{sourceObjectType}}, linkedObjectPrimaryKey: {{linkedPrimaryKeyPropertyV1.type}}) {\n    return source.{{linkApiName}}.get(linkedObjectPrimaryKey);\n}',
-          "computedVariables": ["linkedPrimaryKeyPropertyV1"]
-        }],
-        "loadLinkedObjectsReference": [{
-          "template": 'import { type GetLinkedObjectError, type Result } from "{{{packageName}}}";\nimport { {{sourceObjectType}}, {{linkedObjectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getLinked{{linkedObjectType}}(source: {{sourceObjectType}}) {\n    {{#isLinkManySided}}\n    return source.{{linkApiName}}.page({ pageSize: 30 });\n    {{/isLinkManySided}}\n    {{^isLinkManySided}}\n    return source.{{linkApiName}}.get();\n    {{/isLinkManySided}}\n}'
-        }],
-        "aggregationTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst num{{objectType}} = await client.ontology.objects.{{objectType}}\n    .where(query => Op.not(query.{{property}}.isNull()))\n    .groupBy(property => property.{{property}}.exact())\n    .count()\n    .compute()'
-        }],
-        "countAggregationTemplate": [{
-          "template": "const num{{objectType}} = await client.ontology.objects.{{objectType}}\n    .count()\n    .compute()"
-        }],
-        "approximateDistinctAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nconst distinct{{objectType}} = await client.ontology.objects.{{objectType}}\n    .approximateDistinct(obj => obj.{{property}})\n    .compute()\n\n// This is equivalent to the above, but uses metricName as the metric name instead of the default "distinctCount"\nconst distinct{{objectType}}CustomName = await client.ontology.objects.{{objectType}}\n    .aggregate(obj => ({\n        metricName: obj.{{property}}.approximateDistinct(),\n    }))\n    .compute()'
-        }],
-        "exactDistinctAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nconst distinct{{objectType}} = await client.ontology.objects.{{objectType}}\n    .exactDistinct(obj => obj.{{property}})\n    .compute()\n\n// This is equivalent to the above, but uses metricName as the metric name instead of the default "exactDistinctCount"\nconst distinct{{objectType}}CustomName = await client.ontology.objects.{{objectType}}\n    .aggregate(obj => ({\n        metricName: obj.{{property}}.exactDistinct(),\n    }))\n    .compute()'
-        }],
-        "numericAggregationTemplate": [{
-          "template": 'const {{operation}}{{objectType}} = await client.ontology.objects.{{objectType}}\n    .{{operation}}(obj => obj.{{property}})\n    .compute()\n\n// This is equivalent to the above, but uses "metricName" as the metric name instead of the default "{{operation}}"\nconst {{operation}}{{objectType}}CustomName = await client.ontology.objects.{{objectType}}\n    .aggregate(obj => ({\n        metricName: obj.{{property}}.{{operation}}(),\n    }))\n    .compute()'
-        }],
-        "fixedWidthGroupByTemplate": [{
-          "template": "const grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.fixedWidth(10))\n    .count()\n    .compute()"
-        }],
-        "durationGroupByTemplate": [{
-          "template": "const grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.by{{duration}}({{#durationText}}{{arg}}{{/durationText}}))\n    .count()\n    .compute()"
-        }],
-        "exactGroupByTemplate": [{
-          "template": "const grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.exact())\n    .count()\n    .compute()"
-        }],
-        "rangeGroupByTemplate": [{
-          "template": '{{#isDateProperty}}\nimport { LocalDate } from "{{{packageName}}}";\n\n{{/isDateProperty}}\n{{#isTimestampProperty}}\nimport { Timestamp } from "{{{packageName}}}";\n\n{{/isTimestampProperty}}\nconst grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.ranges([{\n        startValue: {{propertyValueV1}},\n        endValue: {{propertyValueIncrementedV1}}\n    }]))\n    .count()\n    .compute()',
-          "computedVariables": ["propertyValueV1", "propertyValueIncrementedV1"]
-        }],
-        "applyAction": [{
-          "template": 'import { ActionValidationResult, ActionExecutionMode, ReturnEditsMode{{#hasAttachmentImports}}, Attachment{{/hasAttachmentImports}}{{#hasDateInputs}}, LocalDate{{#hasTimestampInputs}}, {{/hasTimestampInputs}}{{/hasDateInputs}}{{#hasTimestampInputs}}, Timestamp{{/hasTimestampInputs}} } from "{{{packageName}}}";\n\n{{#hasAttachmentUpload}}\nconst attachment: Attachment = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client.ontology.actions.{{actionApiName}}({{^hasParameters}}{},{{/hasParameters}}{{#hasParameters}}{\n    {{#actionParameterSampleValuesV1}}\n    "{{key}}": {{{value}}}{{^last}}, {{/last}}\n    {{/actionParameterSampleValuesV1}}\n},{{/hasParameters}} {\n    mode: ActionExecutionMode.VALIDATE_AND_EXECUTE,\n    returnEdits: ReturnEditsMode.ALL,\n    }\n);\n// Check if http request was successful\nif (!isOk(result)) {\n  throw result.error;\n}\n// Check if the validation was successful\nconsole.log(result.value.validation);\nif (result.value.validation.result === ActionValidationResult.VALID) {\n    // If ReturnEditsMode.ALL is used, new and updated objects edits will contain the primary key of the object\n    if (result.value.edits.type === "edits") {\n        console.log(result.value.edits);\n    }\n}',
-          "computedVariables": ["actionParameterSampleValuesV1"]
-        }],
-        "batchApplyAction": [{
-          "template": 'import { ActionExecutionMode, ReturnEditsMode{{#hasAttachmentImports}}, Attachment{{/hasAttachmentImports}}{{#hasDateInputs}}, LocalDate{{#hasTimestampInputs}}, {{/hasTimestampInputs}}{{/hasDateInputs}}{{#hasTimestampInputs}}, Timestamp{{/hasTimestampInputs}} } from "{{{packageName}}}";\n\n{{#hasAttachmentUpload}}\nconst attachment: Attachment = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client.ontology.bulkActions.{{actionApiName}}(\n    [\n        {{^hasParameters}}{},{}{{/hasParameters}}{{#hasParameters}}{\n        {{#actionParameterSampleValuesV1}}\n        "{{key}}": {{{value}}}{{^last}}, {{/last}}\n        {{/actionParameterSampleValuesV1}}\n        },\n        {\n        {{#actionParameterSampleValuesV1}}\n        "{{key}}": {{{value}}}{{^last}}, {{/last}}\n        {{/actionParameterSampleValuesV1}}\n        },{{/hasParameters}}\n    ],\n    {\n        returnEdits: ReturnEditsMode.NONE,\n    }\n);',
-          "computedVariables": ["actionParameterSampleValuesV1"]
-        }],
-        "uploadAttachment": [{
-          "template": 'import { type Result, isOk, Attachment, type AttachmentsError } from "{{{packageName}}}";\n\nasync function uploadMyFile() {\n    const file = await fetch("file.json");\n    const blob = await file.blob();\n    return client.ontology.attachments.upload("myFile", blob);\n}\n\nconst result: Result<Attachment, AttachmentsError> = await uploadMyFile();\n\nif (isOk(result)) {\n    const attachment = result.value;\n    console.log(attachment);\n} else {\n    console.error(result.error.errorType);\n}'
-        }],
-        "executeFunction": [{
-          "template": '{{#needsImports}}\nimport { {{#hasAttachmentImports}}Attachment{{#hasDateInputs}},{{/hasDateInputs}}{{^hasDateInputs}}{{#hasTimestampInputs}},{{/hasTimestampInputs}}{{/hasDateInputs}}{{/hasAttachmentImports}}{{#hasDateInputs}}LocalDate{{#hasTimestampInputs}}, {{/hasTimestampInputs}}{{/hasDateInputs}}{{#hasTimestampInputs}}Timestamp{{/hasTimestampInputs}} } from "{{{packageName}}}";\n\n{{/needsImports}}\n{{#hasAttachmentUpload}}\nconst attachment: Attachment = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client.ontology.queries.{{funcApiName}}({{{functionInputValuesV1}}});',
-          "computedVariables": ["functionInputValuesV1"]
-        }],
-        "stringStartsWithTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.startsWith("foo"));'
-        }],
-        "containsAllTermsInOrderTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.containsAllTermsInOrder("foo bar"));'
-        }],
-        "containsAnyTermTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.containsAnyTerm("foo bar"));'
-        }],
-        "containsAllTermsTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.containsAllTerms("foo bar"));'
-        }],
-        "equalityTemplate": [{
-          "template": '{{#isDateProperty}}\nimport { LocalDate } from "{{{packageName}}}";\n\n{{/isDateProperty}}\n{{#isTimestampProperty}}\nimport { Timestamp } from "{{{packageName}}}";\n\n{{/isTimestampProperty}}\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.eq({{{propertyValueV1}}}));',
-          "computedVariables": ["propertyValueV1"]
-        }],
-        "inFilterTemplate": [{
-          "template": "// Not supported"
-        }],
-        "nullTemplate": [{
-          "template": "const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.isNull());"
-        }],
-        "rangeTemplate": [{
-          "template": '{{#isDateProperty}}\nimport { LocalDate } from "{{{packageName}}}";\n\n{{/isDateProperty}}\n{{#isTimestampProperty}}\nimport { Timestamp } from "{{{packageName}}}";\n\n{{/isTimestampProperty}}\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.{{operation}}({{{propertyValueV1}}}));',
-          "computedVariables": ["propertyValueV1"]
-        }],
-        "withinDistanceTemplate": [{
-          "template": 'import { GeoPoint } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.within{{distanceUnitText}}(\n        // New York City\n        GeoPoint.fromCoordinates({ latitude: 40.7128, longitude: -74.0060 }),\n        100.0,\n    ));'
-        }],
-        "withinBoundingBoxTemplate": [{
-          "template": 'import { GeoPoint } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.withinBoundingBox({\n        topLeft: GeoPoint.fromCoordinates({ latitude: 40.7128, longitude: -74.0060 }),\n        bottomRight: GeoPoint.fromCoordinates({ latitude: 25.123, longitude: 80.4231 }),\n    });'
-        }],
-        "withinPolygonTemplate": [{
-          "template": 'import { Polygon } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.withinPolygon(Polygon.fromGeoJson({\n        type: "Polygon",\n        coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]],\n    }));'
-        }],
-        "intersectsPolygonTemplate": [{
-          "template": 'import { Polygon } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.{{intersects}}Polygon(Polygon.fromGeoJson({\n        type: "Polygon",\n        coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]],\n    }));'
-        }],
-        "intersectsBboxTemplate": [{
-          "template": 'import { GeoPoint } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.{{intersects}}BoundingBox({\n        topLeft: GeoPoint.fromCoordinates({ latitude: 40.7128, longitude: -74.0060 }),\n        bottomRight: GeoPoint.fromCoordinates({ latitude: 25.123, longitude: 80.4231 }),\n    });'
-        }],
-        "notTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => Op.not(query.{{primaryKeyPropertyV1.apiName}}.isNull()));',
-          "computedVariables": ["primaryKeyPropertyV1"]
-        }],
-        "andTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => Op.and(\n        Op.not(query.{{primaryKeyPropertyV1.apiName}}.isNull()),\n        query.{{primaryKeyPropertyV1.apiName}}.eq("primaryKey"),\n    ));',
-          "computedVariables": ["primaryKeyPropertyV1"]
-        }],
-        "orTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => Op.or(\n        query.{{primaryKeyPropertyV1.apiName}}.isNull(),\n        query.{{primaryKeyPropertyV1.apiName}}.eq("primaryKey"),\n    ));',
-          "computedVariables": ["primaryKeyPropertyV1"]
-        }],
-        "loadTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.points.all();\n}'
-        }],
-        "loadRelativeTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\n// Only supports ranges in the past\nfunction getRelativeTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.from{{timeUnitValue}}Ago(1).all();\n}'
-        }],
-        "loadAbsoluteTimeSeriesPointsSnippet": [{
-          "template": 'import { Timestamp } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getRelativeTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.range({\n        startTime: Timestamp.fromISOString("2022-08-13T12:34:56Z"),\n        endTime: Timestamp.fromISOString("2022-08-14T12:34:56Z"),\n    });\n}'
-        }],
-        "loadTimeSeriesFirstPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getFirstPoint();\n}'
-        }],
-        "loadTimeSeriesLastPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getLastPoint();\n}'
-        }],
-        "loadObjectMetadataSnippet": [{
-          "template": "// Not supported."
-        }],
-        "subscribeToObjectSetInstructions": [{
-          "template": "// Subscribing to object sets is only supported in 2.x versions of the SDK."
-        }]
-      }
-    },
-    "1.1.0": {
-      "snippets": {
-        "loadSingleObjectGuide": [{
-          "template": 'import { type GetObjectError, isOk, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst result: Result<{{objectType}}, GetObjectError> = await client.ontology.objects.{{objectType}}.fetchOneWithErrors("primaryKey");\nif (isOk(result)) {\n    const object: {{objectType}} = result.value;\n} else {\n    console.error(result.error.errorType);\n}\n// You can also fetch a single object without the Result wrapper\ntry {\n    const object: {{objectType}} = await client.ontology.objects.{{objectType}}.fetchOne("primaryKey");\n}\ncatch(e) {\n    console.error(e);\n}'
-        }],
-        "loadObjectPageGuide": [{
-          "template": 'import { isOk, type LoadObjectSetError, Page, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst firstPage: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}.fetchPageWithErrors({ pageSize: 30 });\n\nif (isOk(firstPage)) {\n    const secondPage: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}\n        .fetchPageWithErrors({ pageSize: 30, pageToken: firstPage.value.nextPageToken });\n\n    const objects = isOk(secondPage) ? [...firstPage.value.data, ...secondPage.value.data] : firstPage.value.data;\n    const object = objects[0];\n}\n\n// To fetch a page without a result wrapper, use fetchPage with a try/catch instead\ntry {\n    const firstPage: Page<{{objectType}}> = await client.ontology.objects.{{objectType}}.fetchPage({ pageSize: 30 });\n    const secondPage: Page<{{objectType}}> = await client.ontology.objects.{{objectType}}\n        .fetchPage({ pageSize: 30, pageToken: firstPage.value.nextPageToken });\n    const objects = [...firstPage.data, ...secondPage.data];\n    const object = objects[0];\n}\ncatch (e) {\n    console.error(e);\n}'
-        }],
-        "orderObjectsGuide": [{
-          "template": 'import { isOk, Page, type Result, type SearchObjectsError } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst page: Result<Page<{{objectType}}>, SearchObjectsError> = await client.ontology.objects.{{objectType}}\n    .orderBy(sortBy => sortBy.{{titleProperty}}.asc())\n    .fetchPageWithErrors({ pageSize: 30 });\n\nif (isOk(page)) {\n    const objects = page.value.data;\n    const object = objects[0];\n}'
-        }],
-        "searchObjectsGuide": [{
-          "template": 'import { isOk, type LoadObjectSetError, Page, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst page: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}\n    .where(query => query.{{titleProperty}}.isNull())\n    .fetchPageWithErrors({ pageSize: 30 });\n\nif (isOk(page)) {\n    const objects = page.value.data;\n    const object = objects[0];\n}'
-        }],
-        "loadSingleObjectReference": [{
-          "template": 'import { type GetObjectError, type Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst response: Result<{{objectType}}, GetObjectError> = await client.ontology.objects.{{objectType}}.fetchOneWithErrors("primaryKey");\n\n// You can also fetch a single object without the result wrapper\nconst responseNoWrapper: {{objectType}} = await client.ontology.objects.{{objectType}}.fetchOne("primaryKey");\n'
-        }],
-        "loadObjectsReference": [{
-          "template": 'import type { LoadObjectSetError, Page, Result } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst response: Result<Page<{{objectType}}>, LoadObjectSetError> = await client.ontology.objects.{{objectType}}\n    .fetchPageWithErrors({ pageSize: 30 });\n\n// To fetch a page without a result wrapper, use fetchPage instead\nconst responseNoErrorWrapper: Page<{{objectType}}> = await client.ontology.objects.{{objectType}}\n    .fetchPage({ pageSize: 30 });'
-        }],
-        "loadAllObjectsReference": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst objects: {{objectType}}[]= [];\n\nfor await(const obj of client.ontology.objects.{{objectType}}.asyncIter()) {\n    objects.push(obj);\n}\nconst object = objects.value[0];'
-        }],
-        "loadLinkedObjectReference": [{
-          "template": 'import type { GetLinkedObjectError, Result } from "{{{packageName}}}";\nimport { {{sourceObjectType}}, {{linkedObjectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getLinked{{linkedObjectType}}(source: {{sourceObjectType}}, linkedObjectPrimaryKey: {{linkedPrimaryKeyPropertyV1.type}}): Result<{{linkedObjectType}}, GetLinkedObjectError>\n{\n    return source.{{linkApiName}}.fetchOneWithErrors(linkedObjectPrimaryKey);\n}\n\n// You can also get a linked object without the result wrapper\nfunction getLinkedNoWrapper{{linkedObjectType}}(source: {{sourceObjectType}}, linkedObjectPrimaryKey: {{linkedPrimaryKeyPropertyV1.type}}): {{linkedObjectType}} {\n    return source.{{linkApiName}}.fetchOne(linkedObjectPrimaryKey);\n}',
-          "computedVariables": ["linkedPrimaryKeyPropertyV1"]
-        }],
-        "loadLinkedObjectsReference": [{
-          "template": 'import type { GetLinkedObjectError, Result } from "{{{packageName}}}";\nimport { {{sourceObjectType}}, {{linkedObjectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getLinked{{linkedObjectType}}(source: {{sourceObjectType}}) {\n    {{#isLinkManySided}}\n    return source.{{linkApiName}}.fetchPageWithErrors({ pageSize: 30 });\n    {{/isLinkManySided}}\n    {{^isLinkManySided}}\n    return source.{{linkApiName}}.fetchOneWithErrors();\n    {{/isLinkManySided}}\n}'
-        }],
-        "aggregationTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst num{{objectType}} = await client.ontology.objects.{{objectType}}\n    .where(query => Op.not(query.{{property}}.isNull()))\n    .groupBy(property => property.{{property}}.exact())\n    .count()\n    .compute()'
-        }],
-        "countAggregationTemplate": [{
-          "template": "const num{{objectType}} = await client.ontology.objects.{{objectType}}\n    .count()\n    .compute()"
-        }],
-        "approximateDistinctAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nconst distinct{{objectType}} = await client.ontology.objects.{{objectType}}\n    .approximateDistinct(obj => obj.{{property}})\n    .compute()\n\n// This is equivalent to the above, but uses metricName as the metric name instead of the default "distinctCount"\nconst distinct{{objectType}}CustomName = await client.ontology.objects.{{objectType}}\n    .aggregate(obj => ({\n        metricName: obj.{{property}}.approximateDistinct(),\n    }))\n    .compute()'
-        }],
-        "exactDistinctAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nconst distinct{{objectType}} = await client.ontology.objects.{{objectType}}\n    .exactDistinct(obj => obj.{{property}})\n    .compute()\n\n// This is equivalent to the above, but uses metricName as the metric name instead of the default "exactDistinctCount"\nconst distinct{{objectType}}CustomName = await client.ontology.objects.{{objectType}}\n    .aggregate(obj => ({\n        metricName: obj.{{property}}.exactDistinct(),\n    }))\n    .compute()'
-        }],
-        "numericAggregationTemplate": [{
-          "template": 'const {{operation}}{{objectType}} = await client.ontology.objects.{{objectType}}\n    .{{operation}}(obj => obj.{{property}})\n    .compute()\n\n// This is equivalent to the above, but uses "metricName" as the metric name instead of the default "{{operation}}"\nconst {{operation}}{{objectType}}CustomName = await client.ontology.objects.{{objectType}}\n    .aggregate(obj => ({\n        metricName: obj.{{property}}.{{operation}}(),\n    }))\n    .compute()'
-        }],
-        "fixedWidthGroupByTemplate": [{
-          "template": "const grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.fixedWidth(10))\n    .count()\n    .compute()"
-        }],
-        "durationGroupByTemplate": [{
-          "template": "const grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.by{{duration}}({{#durationText}}{{arg}}{{/durationText}}))\n    .count()\n    .compute()"
-        }],
-        "exactGroupByTemplate": [{
-          "template": "const grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.exact())\n    .count()\n    .compute()"
-        }],
-        "rangeGroupByTemplate": [{
-          "template": '{{#isDateProperty}}\nimport { LocalDate } from "{{{packageName}}}";\n\n{{/isDateProperty}}\n{{#isTimestampProperty}}\nimport { Timestamp } from "{{{packageName}}}";\n\n{{/isTimestampProperty}}\nconst grouped{{objectType}} = await client.ontology.objects.{{objectType}}\n    .groupBy(obj => obj.{{property}}.ranges([{\n        startValue: {{propertyValueV1}},\n        endValue: {{propertyValueIncrementedV1}}\n    }]))\n    .count()\n    .compute()',
-          "computedVariables": ["propertyValueV1", "propertyValueIncrementedV1"]
-        }],
-        "applyAction": [{
-          "template": 'import { ActionValidationResult, ActionExecutionMode, ReturnEditsMode{{#hasAttachmentImports}}, Attachment{{/hasAttachmentImports}}{{#hasDateInputs}}, LocalDate{{#hasTimestampInputs}}, {{/hasTimestampInputs}}{{/hasDateInputs}}{{#hasTimestampInputs}}, Timestamp{{/hasTimestampInputs}} } from "{{{packageName}}}";\n\n{{#hasAttachmentUpload}}\nconst attachment: Attachment = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client.ontology.actions.{{actionApiName}}({{^hasParameters}}{},{{/hasParameters}}{{#hasParameters}}{\n    {{#actionParameterSampleValuesV1}}\n    "{{key}}": {{{value}}}{{^last}}, {{/last}}\n    {{/actionParameterSampleValuesV1}}\n},{{/hasParameters}} {\n    mode: ActionExecutionMode.VALIDATE_AND_EXECUTE,\n    returnEdits: ReturnEditsMode.ALL,\n    }\n);\n// Check if http request was successful\nif (!isOk(result)) {\n  throw result.error;\n}\n// Check if the validation was successful\nconsole.log(result.value.validation);\nif (result.value.validation.result === ActionValidationResult.VALID) {\n    // If ReturnEditsMode.ALL is used, new and updated objects edits will contain the primary key of the object\n    if (result.value.edits.type === "edits") {\n        console.log(result.value.edits);\n    }\n}',
-          "computedVariables": ["actionParameterSampleValuesV1"]
-        }],
-        "batchApplyAction": [{
-          "template": 'import { ActionExecutionMode, ReturnEditsMode{{#hasAttachmentImports}}, Attachment{{/hasAttachmentImports}}{{#hasDateInputs}}, LocalDate{{#hasTimestampInputs}}, {{/hasTimestampInputs}}{{/hasDateInputs}}{{#hasTimestampInputs}}, Timestamp{{/hasTimestampInputs}} } from "{{{packageName}}}";\n\n{{#hasAttachmentUpload}}\nconst attachment: Attachment = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client.ontology.batchActions.{{actionApiName}}(\n    [\n        {{^hasParameters}}{},{}{{/hasParameters}}{{#hasParameters}}{\n        {{#actionParameterSampleValuesV1}}\n        "{{key}}": {{{value}}}{{^last}}, {{/last}}\n        {{/actionParameterSampleValuesV1}}\n        },\n        {\n        {{#actionParameterSampleValuesV1}}\n        "{{key}}": {{{value}}}{{^last}}, {{/last}}\n        {{/actionParameterSampleValuesV1}}\n        },{{/hasParameters}}\n    ],\n    {\n        returnEdits: ReturnEditsMode.NONE,\n    }\n);',
-          "computedVariables": ["actionParameterSampleValuesV1"]
-        }],
-        "uploadAttachment": [{
-          "template": 'import { type Result, isOk, type Attachment, type AttachmentsError } from "{{{packageName}}}";\n\nasync function uploadMyFile() {\n    const file = await fetch("file.json");\n    const blob = await file.blob();\n    return client.ontology.attachments.upload("myFile", blob);\n}\n\nconst result: Result<Attachment, AttachmentsError> = await uploadMyFile();\n\nif (isOk(result)) {\n    const attachment = result.value;\n    console.log(attachment);\n} else {\n    console.error(result.error.errorType);\n}'
-        }],
-        "executeFunction": [{
-          "template": '{{#needsImports}}\nimport { {{#hasAttachmentImports}}Attachment{{#hasDateInputs}},{{/hasDateInputs}}{{^hasDateInputs}}{{#hasTimestampInputs}},{{/hasTimestampInputs}}{{/hasDateInputs}}{{/hasAttachmentImports}}{{#hasDateInputs}}LocalDate{{#hasTimestampInputs}}, {{/hasTimestampInputs}}{{/hasDateInputs}}{{#hasTimestampInputs}}Timestamp{{/hasTimestampInputs}} } from "{{{packageName}}}";\n\n{{/needsImports}}\n{{#hasAttachmentUpload}}\nconst attachment: Attachment = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client.ontology.queries.{{funcApiName}}({{{functionInputValuesV1}}});',
-          "computedVariables": ["functionInputValuesV1"]
-        }],
-        "stringStartsWithTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.startsWith("foo"));'
-        }],
-        "containsAllTermsInOrderTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.containsAllTermsInOrder("foo bar"));'
-        }],
-        "containsAnyTermTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.containsAnyTerm("foo bar"));'
-        }],
-        "containsAllTermsTemplate": [{
-          "template": 'const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.containsAllTerms("foo bar"));'
-        }],
-        "equalityTemplate": [{
-          "template": '{{#isDateProperty}}\nimport { LocalDate } from "{{{packageName}}}";\n\n{{/isDateProperty}}\n{{#isTimestampProperty}}\nimport { Timestamp } from "{{{packageName}}}";\n\n{{/isTimestampProperty}}\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.eq({{{propertyValueV1}}}));',
-          "computedVariables": ["propertyValueV1"]
-        }],
-        "inFilterTemplate": [{
-          "template": "// Not supported"
-        }],
-        "nullTemplate": [{
-          "template": "const {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.isNull());"
-        }],
-        "rangeTemplate": [{
-          "template": '{{#isDateProperty}}\nimport { LocalDate } from "{{{packageName}}}";\n\n{{/isDateProperty}}\n{{#isTimestampProperty}}\nimport { Timestamp } from "{{{packageName}}}";\n\n{{/isTimestampProperty}}\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.{{operation}}({{{propertyValueV1}}}));',
-          "computedVariables": ["propertyValueV1"]
-        }],
-        "withinDistanceTemplate": [{
-          "template": 'import { GeoPoint } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.within{{distanceUnitText}}(\n        // New York City\n        GeoPoint.fromCoordinates({ latitude: 40.7128, longitude: -74.0060 }),\n        100.0,\n    ));'
-        }],
-        "withinBoundingBoxTemplate": [{
-          "template": 'import { GeoPoint } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.withinBoundingBox({\n        topLeft: GeoPoint.fromCoordinates({ latitude: 40.7128, longitude: -74.0060 }),\n        bottomRight: GeoPoint.fromCoordinates({ latitude: 25.123, longitude: 80.4231 }),\n    });'
-        }],
-        "withinPolygonTemplate": [{
-          "template": 'import { Polygon } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.withinPolygon(Polygon.fromGeoJson({\n        type: "Polygon",\n        coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]],\n    }));'
-        }],
-        "intersectsPolygonTemplate": [{
-          "template": 'import { Polygon } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.{{intersects}}Polygon(Polygon.fromGeoJson({\n        type: "Polygon",\n        coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]],\n    }));'
-        }],
-        "intersectsBboxTemplate": [{
-          "template": 'import { GeoPoint } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => query.{{property}}.{{intersects}}BoundingBox({\n        topLeft: GeoPoint.fromCoordinates({ latitude: 40.7128, longitude: -74.0060 }),\n        bottomRight: GeoPoint.fromCoordinates({ latitude: 25.123, longitude: 80.4231 }),\n    });'
-        }],
-        "notTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => Op.not(query.{{primaryKeyPropertyV1.apiName}}.isNull()));',
-          "computedVariables": ["primaryKeyPropertyV1"]
-        }],
-        "andTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => Op.and(\n        Op.not(query.{{primaryKeyPropertyV1.apiName}}.isNull()),\n        query.{{primaryKeyPropertyV1.apiName}}.eq("primaryKey"),\n    ));',
-          "computedVariables": ["primaryKeyPropertyV1"]
-        }],
-        "orTemplate": [{
-          "template": 'import { Op } from "{{{packageName}}}";\n\nconst {{objectType}}ObjectSet = client.ontology.objects.{{objectType}}\n    .where(query => Op.or(\n        query.{{primaryKeyPropertyV1.apiName}}.isNull(),\n        query.{{primaryKeyPropertyV1.apiName}}.eq("primaryKey"),\n    ));',
-          "computedVariables": ["primaryKeyPropertyV1"]
-        }],
-        "loadTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.points.all();\n}'
-        }],
-        "loadRelativeTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\n// Only supports ranges in the past\nfunction getRelativeTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.from{{timeUnitValue}}Ago(1).all();\n}'
-        }],
-        "loadAbsoluteTimeSeriesPointsSnippet": [{
-          "template": 'import { Timestamp } from "{{{packageName}}}";\nimport { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getRelativeTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.range({\n        startTime: Timestamp.fromISOString("2022-08-13T12:34:56Z"),\n        endTime: Timestamp.fromISOString("2022-08-14T12:34:56Z"),\n    });\n}'
-        }],
-        "loadTimeSeriesFirstPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getFirstPoint();\n}'
-        }],
-        "loadTimeSeriesLastPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getLastPoint();\n}'
-        }],
-        "loadObjectMetadataSnippet": [{
-          "template": "// Not supported."
-        }],
-        "subscribeToObjectSetInstructions": [{
-          "template": "// Subscribing to object sets is only supported in 2.x versions of the SDK."
-        }]
-      }
-    },
-    "2.0.0": {
-      "snippets": {
-        "loadSingleObjectGuide": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk, type Result } from "@osdk/client";\n\nconst result: Result<Osdk.Instance<{{objectType}}>> = await client({{objectType}}).fetchOneWithErrors("<primaryKey>");\nif (isOk(result)) {\n    const object: Osdk.Instance<{{objectType}}> = result.value;\n} else {\n    console.error(result.error.message);\n}\n// You can also fetch a single object without the Result wrapper\ntry {\n    const object: Osdk.Instance<{{objectType}}> = await client({{objectType}}).fetchOne("<primaryKey>");\n}\ncatch(e) {\n    console.error(e);\n}'
-        }],
-        "loadObjectPageGuide": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk, type PageResult, type Result } from "@osdk/client";\n\nconst firstPage: Result<PageResult<Osdk.Instance<{{objectType}}>>>\n    = await client({{objectType}}).fetchPageWithErrors({ $pageSize: 30 });\n\nif (isOk(firstPage)) {\n    const secondPage: Result<PageResult<Osdk.Instance<{{objectType}}, never, "{{titleProperty}}">>>\n    // You can also down select properties to only get the properties you need from the object\n    = await client({{objectType}}).fetchPageWithErrors({ $select: ["{{titleProperty}}"], $pageSize: 30, $nextPageToken: firstPage.value.nextPageToken });\n\n    const objects = isOk(secondPage) ? [...firstPage.value.data, ...secondPage.value.data] : firstPage.value.data;\n    const object = objects[0];\n}\n\n // If you want to get rids, you need to add a flag to specifically request for it. Note how the return type now includes $rid rather than never\nconst secondPageWithRids: Result<PageResult<Osdk.Instance<{{objectType}}, "$rid", "{{titleProperty}}">>>\n    = await client({{objectType}}).fetchPageWithErrors({ $select: ["{{titleProperty}}"], $includeRid:true, $pageSize: 30, $nextPageToken: firstPage.value.nextPageToken });\n\n// To fetch a page without a result wrapper, use fetchPage with a try/catch instead\ntry {\n    const firstPage: PageResult<Osdk.Instance<{{objectType}}>>\n        = await client({{objectType}}).fetchPage({ $pageSize: 30 });\n    const secondPage: PageResult<Osdk.Instance<{{objectType}}>>\n     = await client({{objectType}}).fetchPage({ $pageSize: 30, $nextPageToken: firstPage.nextPageToken });\n    const objects = [...firstPage.data, ...secondPage.data];\n    const object = objects[0];\n}\ncatch (e) {\n    console.error(e);\n}'
-        }],
-        "orderObjectsGuide": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk, type PageResult, type Result } from "@osdk/client";\n\nconst page: Result<PageResult<Osdk.Instance<{{objectType}}>>> = await client({{objectType}})\n    .fetchPageWithErrors({\n        $orderBy: {"{{titleProperty}}": "asc"},\n        $pageSize: 30\n    });\n\nif (isOk(page)) {\n    const objects = page.value.data;\n    const object = objects[0];\n}'
-        }],
-        "searchObjectsGuide": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk, type PageResult, type Result } from "@osdk/client";\n\nconst page: Result<PageResult<Osdk.Instance<{{objectType}}>>> = await client({{objectType}})\n    .where({\n        {{titleProperty}}: {$isNull: true}\n    })\n    .fetchPageWithErrors({\n        $pageSize: 30\n    });\n\nif (isOk(page)) {\n    const objects = page.value.data;\n    const object = objects[0];\n}'
-        }],
-        "loadSingleObjectReference": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport type { Osdk, Result } from "@osdk/client";\n\nconst response: Result<Osdk.Instance<{{objectType}}>> = await client({{objectType}}).fetchOneWithErrors("<primaryKey>");\n\n// You can also fetch a single object without the Result wrapper\n\nconst responseNoErrorWrapper: Osdk.Instance<{{objectType}}> = await client({{objectType}}).fetchOne("<primaryKey>");\n\n'
-        }],
-        "loadObjectsReference": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport type { Osdk, PageResult, Result } from "@osdk/client";\n\nconst response:  Result<PageResult<Osdk.Instance<{{objectType}}>>>\n    = await client({{objectType}}).fetchPageWithErrors({ $pageSize: 30 });\n\n// To fetch a page without a result wrapper, use fetchPage instead\nconst responseNoErrorWrapper: PageResult<Osdk.Instance<{{objectType}}>>\n    = await client({{objectType}}).fetchPage({ $pageSize: 30 });\n'
-        }],
-        "loadAllObjectsReference": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport type { Osdk } from "@osdk/client";\n\nconst objects: Osdk.Instance<{{objectType}}>[]= [];\n\nfor await(const obj of client({{objectType}}).asyncIter()) {\n    objects.push(obj);\n}\nconst object = objects[0];'
-        }],
-        "loadLinkedObjectReference": [{
-          "template": 'import { {{sourceObjectType}}, {{linkedObjectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { type Osdk, type Result } from "@osdk/client";\n\nfunction getLinked{{linkedObjectType}}(source: Osdk.Instance<{{sourceObjectType}}>, linkedObjectPrimaryKey: {{linkedPrimaryKeyPropertyV2.type}}): Result<Osdk.Instance<{{linkedObjectType}}>>\n{\n    return source.$link.{{linkApiName}}.fetchOneWithErrors(linkedObjectPrimaryKey);\n}\n\n// You can also get a linked object without the result wrapper\nfunction getLinkedNoWrapper{{linkedObjectType}}(source: Osdk.Instance<{{sourceObjectType}}>, linkedObjectPrimaryKey: {{linkedPrimaryKeyPropertyV2.type}}): Osdk.Instance<{{linkedObjectType}}> {\n    return source.$link.{{linkApiName}}.fetchOne(linkedObjectPrimaryKey);\n}',
-          "computedVariables": ["linkedPrimaryKeyPropertyV2"]
-        }],
-        "loadLinkedObjectsReference": [{
-          "template": 'import { {{linkedObjectType}} } from "{{{packageName}}}";\n\nfunction getLinked{{linkedObjectType}}(source: Osdk.Instance<{{sourceObjectType}}>) {\n    {{#isLinkManySided}}\n    return source.$link.{{linkApiName}}.fetchPageWithErrors({ $pageSize: 30 });\n    {{/isLinkManySided}}\n    {{^isLinkManySided}}\n    return source.$link.{{linkApiName}}.fetchOneWithErrors();\n    {{/isLinkManySided}}\n}'
-        }],
-        "aggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst num{{objectType}} = await client({{objectType}})\n    .where({{property}}: { $isNull : false })\n    .aggregate({\n        $select: { $count: "unordered" },\n        $groupBy: { name: "exact" },\n    });'
-        }],
-        "countAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst num{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: {$count: "unordered"},\n    });'
-        }],
-        "approximateDistinctAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst distinct{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: { "{{property}}:approximateDistinct" : "unordered" },\n    });'
-        }],
-        "exactDistinctAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst distinct{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: { "{{property}}:exactDistinct" : "unordered" },\n    });'
-        }],
-        "numericAggregationTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{operation}}{{objectType}} = await client({{objectType}})\n    .aggregation({\n        $select: { "{{property}}:{{operation}}" : "unordered" }\n    });'
-        }],
-        "fixedWidthGroupByTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst grouped{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: { $count: "unordered" },\n        $groupBy: { {{property}} : { $fixedWidth: 10 } }\n    });'
-        }],
-        "durationGroupByTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst grouped{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: { $count: "unordered" },\n        $groupBy: { {{property}} : $duration: [ {{#durationText}}{{arg}}{{/durationText}}, "{{#durationText}}{{unit}}{{/durationText}}"] }\n    })'
-        }],
-        "exactGroupByTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst grouped{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: { $count: "unordered" },\n        $groupBy: { {{property}} : "exact" }\n    })'
-        }],
-        "rangeGroupByTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst grouped{{objectType}} = await client({{objectType}})\n    .aggregate({\n        $select: { $count: "unordered" },\n        $groupBy: { {{property}} : { $ranges: [[{{{propertyValueV2}}}, {{{propertyValueIncrementedV2}}} ]]} }\n    });',
-          "computedVariables": ["propertyValueV2", "propertyValueIncrementedV2"]
-        }],
-        "applyAction": [{
-          "template": 'import { {{actionApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n{{#hasAttachmentImports}}import type { AttachmentUpload } from "@osdk/api";{{/hasAttachmentImports}}{{#hasMediaParameter}}import type { MediaReference } from "@osdk/api";{{/hasMediaParameter}}\n\n\n{{#hasAttachmentUpload}}\nconst attachment: AttachmentUpload = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\n{{#hasMediaParameter}}\nconst mediaReference: MediaReference = uploadMedia();\n{{/hasMediaParameter}}\nconst result = await client({{actionApiName}}).applyAction(\n{{^hasParameters}}{},\n{{/hasParameters}}{{#hasParameters}}\n    {\n    {{#actionParameterSampleValuesV2}}\n    "{{key}}": {{{value}}}{{^last}}, {{/last}}\n    {{/actionParameterSampleValuesV2}}\n    },{{/hasParameters}}\n    {\n    $returnEdits: true,\n    }\n);\n\nif (result.type === "edits") {\n    // for new objects and updated objects edits will contain the primary key of the object\n    const updatedObject = result.editedObjectTypes[0];\n    console.log("Updated object", updatedObject);\n}',
-          "computedVariables": ["actionParameterSampleValuesV2"]
-        }],
-        "batchApplyAction": [{
-          "template": 'import { {{actionApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n{{#hasAttachmentImports}}\nimport type { AttachmentUpload } from "@osdk/api";\n{{/hasAttachmentImports}}{{#hasMediaParameter}}import type { MediaReference } from "@osdk/api";{{/hasMediaParameter}}\n\n\n{{#hasAttachmentUpload}}\nconst attachment: AttachmentUpload = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\n{{#hasMediaParameter}}\nconst mediaReference: MediaReference = uploadMedia();\n{{/hasMediaParameter}}\nconst result = await client({{actionApiName}}).batchApplyAction(\n    [\n        {{^hasParameters}}{},{}{{/hasParameters}}{{#hasParameters}}\n        {\n        {{#actionParameterSampleValuesV2}}\n        "{{key}}": {{{value}}}{{^last}}, {{/last}}\n        {{/actionParameterSampleValuesV2}}\n        },\n        {\n        {{#actionParameterSampleValuesV2}}\n        "{{key}}": {{{value}}}{{^last}}, {{/last}}\n        {{/actionParameterSampleValuesV2}}\n        },{{/hasParameters}}\n    ],\n    {\n        $returnEdits: false,\n    }\n);',
-          "computedVariables": ["actionParameterSampleValuesV2"]
-        }],
-        "uploadAttachment": [{
-          "template": '// Edit this import if your client location differs\nimport { client } from "./client";\nimport { type Result, isOk } from "@osdk/client";\nimport type { AttachmentUpload } from "@osdk/api";\n\n// To upload an attachment with 2.0, it has to be linked to an action call\n\nasync function uploadMyFile() {\n    const file = await fetch("file.json");\n    const blob = await file.blob();\n    return createAttachmentUpload(blob, "myFile");\n}\n\nconst myAttachmentUpload: AttachmentUpload = await uploadMyFile();\n\nconst actionResult = client(attachmentUploadingAction).applyAction({ attachment: myAttachmentUpload });\n'
-        }],
-        "castInterfaceToObjectReference": [{
-          "template": 'import { {{objectTypeApiName}}, {{interfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk } from "@osdk/client";\n\nconst page = await client({{interfaceApiName}}).fetchPageWithErrors();\n\nif (isOk(page)) {\n    const interfaces = page.value.data;\n    const {{interfaceApiNameCamelCase}}: Osdk<{{interfaceApiName}}> = interfaces[0];\n\n    // Cast from interface to object type\n    const {{objectTypeApiNameCamelCase}}: Osdk<{{objectTypeApiName}}> = {{interfaceApiNameCamelCase}}.$as({{objectTypeApiName}});\n    // Or from object type back to interface\n    const {{interfaceApiNameCamelCase}}2: Osdk<{{interfaceApiName}}> = {{objectTypeApiNameCamelCase}}.$as({{interfaceApiName}});\n}'
-        }],
-        "executeFunction": [{
-          "template": '{{#needsImports}}\nimport { {{funcApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n{{#hasAttachmentImports}}import type { AttachmentUpload } from "@osdk/api";{{/hasAttachmentImports}}\n\n{{/needsImports}}\n{{#hasAttachmentUpload}}\nconst attachment: AttachmentUpload = uploadMyFile();\n{{/hasAttachmentUpload}}\n{{#attachmentProperty}}\nconst attachment: Attachment = {{{attachmentProperty}}};\n{{/attachmentProperty}}\nconst result = await client({{funcApiName}}).executeFunction({{{functionInputValuesV2}}});',
-          "computedVariables": ["functionInputValuesV2"]
-        }],
-        "stringStartsWithTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $startsWith: "foo" }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}} : { $startsWith: "foo" }\n        {{/structSubPropertyApiName}}\n    })'
-        }],
-        "containsAllTermsInOrderTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $containsAllTermsInOrder: "foo bar" }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}} : { $containsAllTermsInOrder: "foo bar" }\n        {{/structSubPropertyApiName}}\n    })'
-        }],
-        "containsAnyTermTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $containsAnyTerm: "foo bar" }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}} : { $containsAnyTerm: "foo bar" }\n        {{/structSubPropertyApiName}}\n    })'
-        }],
-        "containsAllTermsTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $containsAllTerms: "foo bar" }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}} : { $containsAllTerms: "foo bar" }\n        {{/structSubPropertyApiName}}\n    })'
-        }],
-        "equalityTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $eq: {{{propertyValueV2}}} }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $eq: {{{propertyValueV2}}} }\n        {{/structSubPropertyApiName}}\n    });',
-          "computedVariables": ["propertyValueV2"]
-        }],
-        "inFilterTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $in: [{{{propertyValueV2}}}] }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $in: [{{{propertyValueV2}}}] }\n        {{/structSubPropertyApiName}}\n    });',
-          "computedVariables": ["propertyValueV2"]
-        }],
-        "nullTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $isNull: true }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $isNull: true }\n        {{/structSubPropertyApiName}}\n    });'
-        }],
-        "rangeTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { ${{operation}}: {{{propertyValueV2}}} }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { ${{operation}}: {{{propertyValueV2}}} }\n        {{/structSubPropertyApiName}}\n    });',
-          "computedVariables": ["propertyValueV2"]
-        }],
-        "withinDistanceTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $within: { $distance: [100, "{{distanceUnit}}"], $of: [-74.0060, 40.7128]} }}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $within: { $distance: [100, "{{distanceUnit}}"], $of: [-74.0060, 40.7128]}}\n        {{/structSubPropertyApiName}}\n    })'
-        }],
-        "withinBoundingBoxTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $within: { $bbox: [-74.0060, 25.123, 80.4231, 40.7128]}}}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $within: { $bbox: [-74.0060, 25.123, 80.4231, 40.7128]}}\n        {{/structSubPropertyApiName}}\n\n    });'
-        }],
-        "withinPolygonTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $within: { type: "Polygon", coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]]}}}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $within: { type: "Polygon", coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]]}}\n        {{/structSubPropertyApiName}}\n    });'
-        }],
-        "intersectsPolygonTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}}: { $intersects: { type: "Polygon", coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]}}}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}}: { $intersects: { type: "Polygon", coordinates: [[[10.0, 40.0], [20.0, 50.0], [20.0, 30.0], [10.0, 40.0]]}}\n        {{/structSubPropertyApiName}}\n    });'
-        }],
-        "intersectsBboxTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({\n        {{#structSubPropertyApiName}}\n        {{property}}: { {{structSubPropertyApiName}} : { $intersects: { $bbox: [-74.0060, 25.123, 80.4231, 40.7128]}}}\n        {{/structSubPropertyApiName}}\n        {{^structSubPropertyApiName}}\n        {{property}} : { $intersects: { $bbox: [-74.0060, 25.123, 80.4231, 40.7128]}}\n        {{/structSubPropertyApiName}}\n    });'
-        }],
-        "notTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({ $not: { {{primaryKeyPropertyV2.apiName}}: { $isNull: true }}});',
-          "computedVariables": ["primaryKeyPropertyV2"]
-        }],
-        "andTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({ $and:[\n        { $not: { {{primaryKeyPropertyV2.apiName}}: { $isNull: true }}},\n        { {{primaryKeyPropertyV2.apiName}}: { $eq: "<primaryKey>" }}\n    ]});',
-          "computedVariables": ["primaryKeyPropertyV2"]
-        }],
-        "orTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst {{objectType}}ObjectSet = client({{objectType}})\n    .where({ $or:[\n        { $not: { {{primaryKeyPropertyV2.apiName}}: { $isNull: true }}},\n        { {{primaryKeyPropertyV2.apiName}}: { $eq: "<primaryKey>" }}\n    ]});',
-          "computedVariables": ["primaryKeyPropertyV2"]
-        }],
-        "containsTemplate": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst filteredObjects = client({{objectType}})\n    .where({\n        {{property}} : { $contains: {{{arrayElementValue}}} }\n    })',
-          "computedVariables": ["arrayElementValue"]
-        }],
-        "loadInterfacesReference": [{
-          "template": 'import { {{interfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { type Osdk, type PageResult, type Result } from "@osdk/client";\n\nconst response:  Result<PageResult<Osdk<{{interfaceApiName}}>>>\n    = await client({{interfaceApiName}}).fetchPageWithErrors({ $pageSize: 30 });\n\n// To fetch a page without a result wrapper, use fetchPage instead\nconst responseNoErrorWrapper: PageResult<Osdk<{{interfaceApiName}}>>\n    = await client({{interfaceApiName}}).fetchPage({ $pageSize: 30 });'
-        }],
-        "loadAllInterfacesReference": [{
-          "template": 'import { {{interfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport type { Osdk } from "@osdk/client";\n\nconst interfaces: Osdk<{{interfaceApiName}}>[] = [];\n\nfor await(const int of client({{interfaceApiName}}).asyncIter()) {\n    interfaces.push(int);\n}\nconst interface1 = interfaces[0];'
-        }],
-        "loadOrderedInterfacesReference": [{
-          "template": 'import { {{interfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk, type PageResult, type Result } from "@osdk/client";\n\nconst page: Result<PageResult<Osdk<{{interfaceApiName}}>>> = await client({{interfaceApiName}})\n    .fetchPageWithErrors({\n        $orderBy: {"someProperty": "asc"},\n        $pageSize: 30\n    });\n\nif (isOk(page)) {\n    const interfaces = page.value.data;\n    const interface1 = interfaces[0];\n}'
-        }],
-        "searchInterfacesReference": [{
-          "template": 'import { {{interfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { isOk, type Osdk, type PageResult, type Result } from "@osdk/client";\n\nconst page: Result<PageResult<Osdk<{{interfaceApiName}}>>> = await client({{interfaceApiName}})\n    .where({\n        $and:[\n            { $not: { someProperty: { $isNull: true }}},\n            { someProperty: { $eq: "foo" }}\n        ]\n    })\n    .fetchPageWithErrors({\n        $pageSize: 30\n    });\n\nif (isOk(page)) {\n    const interfaces = page.value.data;\n    const interface1 = interfaces[0];\n}'
-        }],
-        "loadTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getAllPoints();\n}'
-        }],
-        "loadRelativeTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\n// Only supports ranges in the past\nfunction getRelativeTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getAllPoints({\n        $before: 1,\n        $unit: "{{timeUnit}}",\n    })\n}'
-        }],
-        "loadAbsoluteTimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getAbsoluteTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getAllPoints({\n        $startTime: "2022-08-13T12:34:56Z",\n        $endTime: "2022-08-14T12:34:56Z",\n    });\n}'
-        }],
-        "loadTimeSeriesFirstPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getFirstTimeSeriesPoint(obj: {{objectType}}) {\n    return obj.{{property}}.getFirstPoint();\n}'
-        }],
-        "loadTimeSeriesLastPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getLastTimeSeriesPoint(obj: {{objectType}}) {\n    return obj.{{property}}.getLastPoint();\n}'
-        }],
-        "loadGeotimeSeriesPointsSnippet": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "loadRelativeGeotimeSeriesPointsSnippet": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "loadAbsoluteGeotimeSeriesPointsSnippet": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "loadGeotimeSeriesLastPointSnippet": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "loadObjectMetadataSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst objectTypeMetadata = await client.fetchMetadata({{objectType}});\n\nif (objectTypeMetadata.icon.type === "blueprint") {\n    const blueprintIconName = objectTypeMetadata.icon.name;\n}\nconst currentVisibility = objectTypeMetadata.visibility;\nconst currentDescription = objectTypeMetadata.description;'
-        }],
-        "loadInterfaceMetadataSnippet": [{
-          "template": 'import { {{interfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst interfaceTypeMetadata = await client.fetchMetadata({{interfaceApiName}});\n\nconst implementingObjectTypes = interfaceTypeMetadata.implementedBy;\nconst interfaceRid = interfaceTypeMetadata.rid;'
-        }],
-        "subscribeToObjectSetInstructions": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "uploadMedia": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "readMedia": [{
-          "template": "// Upgrade to 2.1 for official support"
-        }],
-        "derivedPropertyBaseExample": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("fooLink").pivotTo("barLink").selectProperty("foo")\n    })\n    .where({\n      "newPropertyName": { $gt: 10 }\n    })\n    .aggregate({\n      $select: { "newPropertyName:max": "unordered" }\n    });'
-        }],
-        "derivedPropertyApproximateDistinctAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("{{property}}:approximateDistinct")\n    })'
-        }],
-        "derivedPropertyExactDistinctAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("{{property}}:exactDistinct")\n    })'
-        }],
-        "derivedPropertyCollectToListAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("{{property}}:collectToList", 75)\n    })'
-        }],
-        "derivedPropertyCollectToSetAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("{{property}}:collectToSet", 75)\n    })'
-        }],
-        "derivedPropertyCountAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("$count")\n    })'
-        }],
-        "derivedPropertySelectPropertyAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").selectProperty("{{property}}")\n    })'
-        }],
-        "derivedPropertyApproximatePercentileAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("{{property}}:approximatePercentile", 0.5)\n    })'
-        }],
-        "derivedPropertyNumericAggregation": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\nconst sum{{objectType}} = await client({{objectType}})\n    .withProperties({\n      "newPropertyName": (baseObjectSet) =>\n        baseObjectSet.pivotTo("{{linkName}}").aggregate("{{property}}:{{operation}}")\n    })'
-        }],
-        "objectSetOperationsGuide": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst objectSetA = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "a"}})\nconst objectSetB = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "b"}})\nconst objectSetC = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "c"}})\n\n// Object set operations can be chained. e.g. To find all objects in objectSetA \n// that are present in objectSetB but do not exist in objectSetC:\nconst result = objectSetA\n  .intersect(objectSetB)\n  .subtract(objectSetC);'
-        }],
-        "objectSetOperationsUnion": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst objectSetA = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "a"}})\nconst objectSetB = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "b"}})\nconst objectSetC = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "c"}})\n\n// Combine objectSetA, objectSetB and objectSetC\nconst result = objectSetA\n  .union(objectSetB)\n  .union(objectSetC); // alternatively: objectSetA.union(objectSetB, objectSetC)'
-        }],
-        "objectSetOperationsSubtract": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst objectSetA = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "a"}})\nconst objectSetB = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "b"}})\nconst objectSetC = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "c"}})\n\n\n// Return objects in objectSetA that are not present in either objectSetB or objectSetC\nconst result = objectSetA\n  .subtract(objectSetB)\n  .subtract(objectSetC); // alternatively: objectSetA.subtract(objectSetB, objectSetC)'
-        }],
-        "objectSetOperationsIntersect": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}/ontology/objects";\n\nconst objectSetA = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "a"}})\nconst objectSetB = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "b"}})\nconst objectSetC = client({{objectType}}).where({ {{titleProperty}}: { $containsAnyTerm: "c"}})\n\n\n// Return all objects common to objectSetA, objectSetB and objectSetC\nconst result = objectSetA\n  .intersect(objectSetB)\n  .intersect(objectSetC); // alternatively: objectSetA.intersect(objectSetB, objectSetC)'
-        }],
-        "searchAround": [{
-          "template": 'import { {{sourceObjectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\n// Object set containing objects a, b and c\nconst objects = client({{sourceObjectType}})\n    .where({ {{rawLinkedPrimaryKeyProperty.apiName}}: { $in: ["a", "b", "c"]}});\n\n// Traverse the selected link type to find all objects of type\n// {{linkedObjectType}} linked to objects a, b and c\nconst linkedObjects = await objects.pivotTo("{{linkApiName}}");'
-        }]
-      }
-    },
-    "2.1.0": {
-      "snippets": {
-        "loadGeotimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getAllTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getAllValues();\n}'
-        }],
-        "loadRelativeGeotimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\n// Only supports ranges in the past\nfunction getRelativeTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getAllValues({\n        $before: 1,\n        $unit: "{{timeUnit}}",\n    })\n}'
-        }],
-        "loadAbsoluteGeotimeSeriesPointsSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getAbsoluteTimeSeriesPoints(obj: {{objectType}}) {\n    return obj.{{property}}.getAllValues({\n        $startTime: "2022-08-13T12:34:56Z",\n        $endTime: "2022-08-14T12:34:56Z",\n    });\n}'
-        }],
-        "loadGeotimeSeriesLastPointSnippet": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n\nfunction getLastTimeSeriesPoint(obj: {{objectType}}) {\n    return obj.{{property}}.getLatestValue();\n}'
-        }],
-        "subscribeToObjectSetInstructions": [{
-          "template": 'import { {{objectOrInterfaceApiName}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\n\n// A map of primary keys to objects loaded through the SDK\nconst objects: { [key: string]: {{objectOrInterfaceApiName}}.OsdkInstance } = ...\n\nconst subscription = client({{objectOrInterfaceApiName}}).subscribe(         {\n            onChange(update) {\n                if (update.state === "ADDED_OR_UPDATED") {\n                    // An object has received an update or an object was added to the object set\n                    const currentObject = objects[update.object.$primaryKey];\n                    if (currentObject !== undefined) {\n                        currentObject["<propertyName>"] = update.object["<propertyName>"] ?? currentObject["<propertyName>"];\n                    }\n                }\n                else if (update.state === "REMOVED") {\n                    // The object was removed from the object set, which could mean it was deleted or no longer meets the filter criteria\n                    delete objects[update.object.$primaryKey];\n                }\n            },\n            onSuccessfulSubscription() {\n                // The subscription was successful and you can expect to receive updates\n            },\n            onError(err) {\n                // There was an error with the subscription and you will not receive any more updates\n                console.error(err);\n            },\n            onOutOfDate() {\n                // We could not keep track of all changes. Please reload the objects in your set.\n            },\n        },\n        { properties: [ {{#propertyNames}}"{{.}}", {{/propertyNames}}\b\b]}\n    );\n\nsubscription.unsubscribe();'
-        }],
-        "uploadMedia": [{
-          "template": 'import { __EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference } from "@osdk/api/unstable";\nimport { {{objectType}} } from "{{{packageName}}}"\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport { Result, isOk } from "@osdk/client";\nimport type { MediaReference } from "@osdk/api";\n\n// To upload media with 2.x, it has to be linked to an Action call\nasync function uploadMedia() {\n    const file = await fetch("file.json");\n    const data = await file.blob();\n\n    // Upload media to an object type with a media property. This returns a media reference that can passed to\n    // a media parameter in an Action.\n    return await client(\n        __EXPERIMENTAL__NOT_SUPPORTED_YET__createMediaReference,\n    ).createMediaReference({\n        data,\n        fileName: "myFile",\n        objectType: {{objectType}},\n        propertyType: "MediaPropertyApi",\n    });\n}\n\nconst mediaReference: MediaReference = await uploadMedia();\nconst actionResult = client(mediaUploadingAction).applyAction({ media_parameter: mediaReference });'
-        }],
-        "readMedia": [{
-          "template": 'import { {{objectType}} } from "{{{packageName}}}";\n// Edit this import if your client location differs\nimport { client } from "./client";\nimport type { MediaMetadata, MediaReference } from "@osdk/api";\nimport { Osdk, Result } from "@osdk/client";\n\nconst result = await client({{objectType}}).fetchOne("<primaryKey>");\n\n// Fetch metadata of a media property\nconst mediaMetadata = await result.{{property}}?.fetchMetadata();\n\n// Fetch contents of a media property\nconst response = await result.{{property}}?.fetchContents();\n\nif (response.ok) {\n    const data = await response.blob();\n    ...\n}'
-        }]
-      }
-    }
-  }
-};
-var TYPESCRIPT_OSDK_SNIPPETS = {
-  ...snippets};
-
-// ../../node_modules/.pnpm/mustache@4.2.0/node_modules/mustache/mustache.mjs
-var objectToString = Object.prototype.toString;
-var isArray = Array.isArray || function isArrayPolyfill(object) {
-  return objectToString.call(object) === "[object Array]";
-};
-function isFunction(object) {
-  return typeof object === "function";
-}
-function typeStr(obj) {
-  return isArray(obj) ? "array" : typeof obj;
-}
-function escapeRegExp(string) {
-  return string.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
-}
-function hasProperty(obj, propName) {
-  return obj != null && typeof obj === "object" && propName in obj;
-}
-function primitiveHasOwnProperty(primitive, propName) {
-  return primitive != null && typeof primitive !== "object" && primitive.hasOwnProperty && primitive.hasOwnProperty(propName);
-}
-var regExpTest = RegExp.prototype.test;
-function testRegExp(re, string) {
-  return regExpTest.call(re, string);
-}
-var nonSpaceRe = /\S/;
-function isWhitespace(string) {
-  return !testRegExp(nonSpaceRe, string);
-}
-var entityMap = {
-  "&": "&amp;",
-  "<": "&lt;",
-  ">": "&gt;",
-  '"': "&quot;",
-  "'": "&#39;",
-  "/": "&#x2F;",
-  "`": "&#x60;",
-  "=": "&#x3D;"
-};
-function escapeHtml(string) {
-  return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap(s) {
-    return entityMap[s];
-  });
-}
-var whiteRe = /\s*/;
-var spaceRe = /\s+/;
-var equalsRe = /\s*=/;
-var curlyRe = /\s*\}/;
-var tagRe = /#|\^|\/|>|\{|&|=|!/;
-function parseTemplate(template, tags) {
-  if (!template) return [];
-  var lineHasNonSpace = false;
-  var sections = [];
-  var tokens = [];
-  var spaces = [];
-  var hasTag = false;
-  var nonSpace = false;
-  var indentation = "";
-  var tagIndex = 0;
-  function stripSpace() {
-    if (hasTag && !nonSpace) {
-      while (spaces.length) delete tokens[spaces.pop()];
-    } else {
-      spaces = [];
-    }
-    hasTag = false;
-    nonSpace = false;
-  }
-  var openingTagRe, closingTagRe, closingCurlyRe;
-  function compileTags(tagsToCompile) {
-    if (typeof tagsToCompile === "string") tagsToCompile = tagsToCompile.split(spaceRe, 2);
-    if (!isArray(tagsToCompile) || tagsToCompile.length !== 2) throw new Error("Invalid tags: " + tagsToCompile);
-    openingTagRe = new RegExp(escapeRegExp(tagsToCompile[0]) + "\\s*");
-    closingTagRe = new RegExp("\\s*" + escapeRegExp(tagsToCompile[1]));
-    closingCurlyRe = new RegExp("\\s*" + escapeRegExp("}" + tagsToCompile[1]));
-  }
-  compileTags(tags || mustache.tags);
-  var scanner = new Scanner(template);
-  var start, type, value, chr, token, openSection;
-  while (!scanner.eos()) {
-    start = scanner.pos;
-    value = scanner.scanUntil(openingTagRe);
-    if (value) {
-      for (var i = 0, valueLength = value.length; i < valueLength; ++i) {
-        chr = value.charAt(i);
-        if (isWhitespace(chr)) {
-          spaces.push(tokens.length);
-          indentation += chr;
-        } else {
-          nonSpace = true;
-          lineHasNonSpace = true;
-          indentation += " ";
-        }
-        tokens.push(["text", chr, start, start + 1]);
-        start += 1;
-        if (chr === "\n") {
-          stripSpace();
-          indentation = "";
-          tagIndex = 0;
-          lineHasNonSpace = false;
-        }
-      }
-    }
-    if (!scanner.scan(openingTagRe)) break;
-    hasTag = true;
-    type = scanner.scan(tagRe) || "name";
-    scanner.scan(whiteRe);
-    if (type === "=") {
-      value = scanner.scanUntil(equalsRe);
-      scanner.scan(equalsRe);
-      scanner.scanUntil(closingTagRe);
-    } else if (type === "{") {
-      value = scanner.scanUntil(closingCurlyRe);
-      scanner.scan(curlyRe);
-      scanner.scanUntil(closingTagRe);
-      type = "&";
-    } else {
-      value = scanner.scanUntil(closingTagRe);
-    }
-    if (!scanner.scan(closingTagRe)) throw new Error("Unclosed tag at " + scanner.pos);
-    if (type == ">") {
-      token = [type, value, start, scanner.pos, indentation, tagIndex, lineHasNonSpace];
-    } else {
-      token = [type, value, start, scanner.pos];
-    }
-    tagIndex++;
-    tokens.push(token);
-    if (type === "#" || type === "^") {
-      sections.push(token);
-    } else if (type === "/") {
-      openSection = sections.pop();
-      if (!openSection) throw new Error('Unopened section "' + value + '" at ' + start);
-      if (openSection[1] !== value) throw new Error('Unclosed section "' + openSection[1] + '" at ' + start);
-    } else if (type === "name" || type === "{" || type === "&") {
-      nonSpace = true;
-    } else if (type === "=") {
-      compileTags(value);
-    }
-  }
-  stripSpace();
-  openSection = sections.pop();
-  if (openSection) throw new Error('Unclosed section "' + openSection[1] + '" at ' + scanner.pos);
-  return nestTokens(squashTokens(tokens));
-}
-function squashTokens(tokens) {
-  var squashedTokens = [];
-  var token, lastToken;
-  for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-    token = tokens[i];
-    if (token) {
-      if (token[0] === "text" && lastToken && lastToken[0] === "text") {
-        lastToken[1] += token[1];
-        lastToken[3] = token[3];
-      } else {
-        squashedTokens.push(token);
-        lastToken = token;
-      }
-    }
-  }
-  return squashedTokens;
-}
-function nestTokens(tokens) {
-  var nestedTokens = [];
-  var collector = nestedTokens;
-  var sections = [];
-  var token, section;
-  for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-    token = tokens[i];
-    switch (token[0]) {
-      case "#":
-      case "^":
-        collector.push(token);
-        sections.push(token);
-        collector = token[4] = [];
-        break;
-      case "/":
-        section = sections.pop();
-        section[5] = token[2];
-        collector = sections.length > 0 ? sections[sections.length - 1][4] : nestedTokens;
-        break;
-      default:
-        collector.push(token);
-    }
-  }
-  return nestedTokens;
-}
-function Scanner(string) {
-  this.string = string;
-  this.tail = string;
-  this.pos = 0;
-}
-Scanner.prototype.eos = function eos() {
-  return this.tail === "";
-};
-Scanner.prototype.scan = function scan(re) {
-  var match = this.tail.match(re);
-  if (!match || match.index !== 0) return "";
-  var string = match[0];
-  this.tail = this.tail.substring(string.length);
-  this.pos += string.length;
-  return string;
-};
-Scanner.prototype.scanUntil = function scanUntil(re) {
-  var index = this.tail.search(re), match;
-  switch (index) {
-    case -1:
-      match = this.tail;
-      this.tail = "";
-      break;
-    case 0:
-      match = "";
-      break;
-    default:
-      match = this.tail.substring(0, index);
-      this.tail = this.tail.substring(index);
-  }
-  this.pos += match.length;
-  return match;
-};
-function Context(view, parentContext) {
-  this.view = view;
-  this.cache = {
-    ".": this.view
-  };
-  this.parent = parentContext;
-}
-Context.prototype.push = function push(view) {
-  return new Context(view, this);
-};
-Context.prototype.lookup = function lookup(name) {
-  var cache = this.cache;
-  var value;
-  if (cache.hasOwnProperty(name)) {
-    value = cache[name];
-  } else {
-    var context = this, intermediateValue, names, index, lookupHit = false;
-    while (context) {
-      if (name.indexOf(".") > 0) {
-        intermediateValue = context.view;
-        names = name.split(".");
-        index = 0;
-        while (intermediateValue != null && index < names.length) {
-          if (index === names.length - 1) lookupHit = hasProperty(intermediateValue, names[index]) || primitiveHasOwnProperty(intermediateValue, names[index]);
-          intermediateValue = intermediateValue[names[index++]];
-        }
-      } else {
-        intermediateValue = context.view[name];
-        lookupHit = hasProperty(context.view, name);
-      }
-      if (lookupHit) {
-        value = intermediateValue;
-        break;
-      }
-      context = context.parent;
-    }
-    cache[name] = value;
-  }
-  if (isFunction(value)) value = value.call(this.view);
-  return value;
-};
-function Writer() {
-  this.templateCache = {
-    _cache: {},
-    set: function set(key, value) {
-      this._cache[key] = value;
-    },
-    get: function get(key) {
-      return this._cache[key];
-    },
-    clear: function clear() {
-      this._cache = {};
-    }
-  };
-}
-Writer.prototype.clearCache = function clearCache() {
-  if (typeof this.templateCache !== "undefined") {
-    this.templateCache.clear();
-  }
-};
-Writer.prototype.parse = function parse(template, tags) {
-  var cache = this.templateCache;
-  var cacheKey = template + ":" + (tags || mustache.tags).join(":");
-  var isCacheEnabled = typeof cache !== "undefined";
-  var tokens = isCacheEnabled ? cache.get(cacheKey) : void 0;
-  if (tokens == void 0) {
-    tokens = parseTemplate(template, tags);
-    isCacheEnabled && cache.set(cacheKey, tokens);
-  }
-  return tokens;
-};
-Writer.prototype.render = function render(template, view, partials, config) {
-  var tags = this.getConfigTags(config);
-  var tokens = this.parse(template, tags);
-  var context = view instanceof Context ? view : new Context(view, void 0);
-  return this.renderTokens(tokens, context, partials, template, config);
-};
-Writer.prototype.renderTokens = function renderTokens(tokens, context, partials, originalTemplate, config) {
-  var buffer = "";
-  var token, symbol, value;
-  for (var i = 0, numTokens = tokens.length; i < numTokens; ++i) {
-    value = void 0;
-    token = tokens[i];
-    symbol = token[0];
-    if (symbol === "#") value = this.renderSection(token, context, partials, originalTemplate, config);
-    else if (symbol === "^") value = this.renderInverted(token, context, partials, originalTemplate, config);
-    else if (symbol === ">") value = this.renderPartial(token, context, partials, config);
-    else if (symbol === "&") value = this.unescapedValue(token, context);
-    else if (symbol === "name") value = this.escapedValue(token, context, config);
-    else if (symbol === "text") value = this.rawValue(token);
-    if (value !== void 0) buffer += value;
-  }
-  return buffer;
-};
-Writer.prototype.renderSection = function renderSection(token, context, partials, originalTemplate, config) {
-  var self = this;
-  var buffer = "";
-  var value = context.lookup(token[1]);
-  function subRender(template) {
-    return self.render(template, context, partials, config);
-  }
-  if (!value) return;
-  if (isArray(value)) {
-    for (var j = 0, valueLength = value.length; j < valueLength; ++j) {
-      buffer += this.renderTokens(token[4], context.push(value[j]), partials, originalTemplate, config);
-    }
-  } else if (typeof value === "object" || typeof value === "string" || typeof value === "number") {
-    buffer += this.renderTokens(token[4], context.push(value), partials, originalTemplate, config);
-  } else if (isFunction(value)) {
-    if (typeof originalTemplate !== "string") throw new Error("Cannot use higher-order sections without the original template");
-    value = value.call(context.view, originalTemplate.slice(token[3], token[5]), subRender);
-    if (value != null) buffer += value;
-  } else {
-    buffer += this.renderTokens(token[4], context, partials, originalTemplate, config);
-  }
-  return buffer;
-};
-Writer.prototype.renderInverted = function renderInverted(token, context, partials, originalTemplate, config) {
-  var value = context.lookup(token[1]);
-  if (!value || isArray(value) && value.length === 0) return this.renderTokens(token[4], context, partials, originalTemplate, config);
-};
-Writer.prototype.indentPartial = function indentPartial(partial, indentation, lineHasNonSpace) {
-  var filteredIndentation = indentation.replace(/[^ \t]/g, "");
-  var partialByNl = partial.split("\n");
-  for (var i = 0; i < partialByNl.length; i++) {
-    if (partialByNl[i].length && (i > 0 || !lineHasNonSpace)) {
-      partialByNl[i] = filteredIndentation + partialByNl[i];
-    }
-  }
-  return partialByNl.join("\n");
-};
-Writer.prototype.renderPartial = function renderPartial(token, context, partials, config) {
-  if (!partials) return;
-  var tags = this.getConfigTags(config);
-  var value = isFunction(partials) ? partials(token[1]) : partials[token[1]];
-  if (value != null) {
-    var lineHasNonSpace = token[6];
-    var tagIndex = token[5];
-    var indentation = token[4];
-    var indentedValue = value;
-    if (tagIndex == 0 && indentation) {
-      indentedValue = this.indentPartial(value, indentation, lineHasNonSpace);
-    }
-    var tokens = this.parse(indentedValue, tags);
-    return this.renderTokens(tokens, context, partials, indentedValue, config);
-  }
-};
-Writer.prototype.unescapedValue = function unescapedValue(token, context) {
-  var value = context.lookup(token[1]);
-  if (value != null) return value;
-};
-Writer.prototype.escapedValue = function escapedValue(token, context, config) {
-  var escape = this.getConfigEscape(config) || mustache.escape;
-  var value = context.lookup(token[1]);
-  if (value != null) return typeof value === "number" && escape === mustache.escape ? String(value) : escape(value);
-};
-Writer.prototype.rawValue = function rawValue(token) {
-  return token[1];
-};
-Writer.prototype.getConfigTags = function getConfigTags(config) {
-  if (isArray(config)) {
-    return config;
-  } else if (config && typeof config === "object") {
-    return config.tags;
-  } else {
-    return void 0;
-  }
-};
-Writer.prototype.getConfigEscape = function getConfigEscape(config) {
-  if (config && typeof config === "object" && !isArray(config)) {
-    return config.escape;
-  } else {
-    return void 0;
-  }
-};
-var mustache = {
-  name: "mustache.js",
-  version: "4.2.0",
-  tags: ["{{", "}}"],
-  clearCache: void 0,
-  escape: void 0,
-  parse: void 0,
-  render: void 0,
-  Scanner: void 0,
-  Context: void 0,
-  Writer: void 0,
-  /**
-   * Allows a user to override the default caching strategy, by providing an
-   * object with set, get and clear methods. This can also be used to disable
-   * the cache by setting it to the literal `undefined`.
-   */
-  set templateCache(cache) {
-    defaultWriter.templateCache = cache;
-  },
-  /**
-   * Gets the default or overridden caching object from the default writer.
-   */
-  get templateCache() {
-    return defaultWriter.templateCache;
-  }
-};
-var defaultWriter = new Writer();
-mustache.clearCache = function clearCache2() {
-  return defaultWriter.clearCache();
-};
-mustache.parse = function parse2(template, tags) {
-  return defaultWriter.parse(template, tags);
-};
-mustache.render = function render2(template, view, partials, config) {
-  if (typeof template !== "string") {
-    throw new TypeError('Invalid template! Template should be a "string" but "' + typeStr(template) + '" was given as the first argument for mustache#render(template, view, partials)');
-  }
-  return defaultWriter.render(template, view, partials, config);
-};
-mustache.escape = escapeHtml;
-mustache.Scanner = Scanner;
-mustache.Context = Context;
-mustache.Writer = Writer;
-var mustache_default = mustache;
-
 // src/api/code-snippets/snippetTypes.ts
 var interfaceSnippets = /* @__PURE__ */ (function(interfaceSnippets2) {
   interfaceSnippets2[interfaceSnippets2["loadInterfacesReference"] = 0] = "loadInterfacesReference";
@@ -2603,6 +1484,7 @@ var objectSnippets = /* @__PURE__ */ (function(objectSnippets2) {
   objectSnippets2[objectSnippets2["subscribeToObjectSetInstructions"] = 8] = "subscribeToObjectSetInstructions";
   return objectSnippets2;
 })({});
+var snippetNameMapping = /* @__PURE__ */ new Map([["loadInterfaceMetadataSnippet", "Load {{interfaceName}} metadata"], ["loadInterfacesReference", "Load pages of {{interfaceName}}"], ["loadAllInterfacesReference", "Load all {{interfaceName}}"], ["loadOrderedInterfacesReference", "Load ordered {{interfaceName}}"], ["searchInterfacesReference", "Filtering"], ["subscribeToObjectSetInstructions", "Subscribe to object sets"]]);
 
 // src/api/code-snippets/createCodeSnippets.ts
 function createCodeSnippets(ontology, packageName, outputDir) {
@@ -2644,7 +1526,8 @@ function generateInterfaceSnippet(interfaceType, packageName) {
     "interfaceApiName": interfaceType.apiName,
     "packageName": packageName,
     "objectOrInterfaceApiName": interfaceType.apiName,
-    "propertyNames": Object.keys(interfaceType.propertiesV2)
+    "propertyNames": Object.keys(interfaceType.propertiesV2),
+    "interfaceName": interfaceType.displayMetadata.displayName
   };
   return getSnippets(interfaceSnippets, interfaceContext);
 }
@@ -2666,9 +1549,11 @@ function generateActionSnippet(actionType, packageName) {
 function getSnippets(snippetType, context) {
   const allSnippets = {};
   for (const templateName of Object.keys(snippetType).filter((key) => isNaN(Number(key)))) {
-    const latestTemplate = Object.values(TYPESCRIPT_OSDK_SNIPPETS.versions).find((v) => v.snippets[templateName])?.snippets[templateName][0].template ?? "";
-    const renderedTemplate = mustache_default.render(latestTemplate, context);
-    allSnippets[templateName] = renderedTemplate;
+    const versions = Object.values(typescriptSdkDocs.TYPESCRIPT_OSDK_SNIPPETS.versions);
+    const latestTemplate = versions.slice().reverse().find((v) => v.snippets[templateName])?.snippets[templateName].at(-1)?.template ?? "";
+    const renderedTemplate = Mustache__default.default.render(latestTemplate, context);
+    const snippetName = snippetNameMapping.get(templateName);
+    allSnippets[snippetName !== void 0 ? Mustache__default.default.render(snippetName, context) : templateName] = renderedTemplate;
   }
   return allSnippets;
 }
@@ -3155,7 +2040,7 @@ function addNamespaceIfNone(apiName) {
 var apiNamespaceRegex = /^[a-z0-9-]+(\.[a-z0-9-]+)*\.$/;
 var uuidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/;
 async function main(args = process.argv) {
-  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.14.0-beta.9").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
+  const commandLineOpts = await yargs__default.default(helpers.hideBin(args)).version("0.15.0-beta.1").wrap(Math.min(150, yargs__default.default().terminalWidth())).strict().help().options({
     input: {
       alias: "i",
       describe: "Input file",
@@ -3853,8 +2738,14 @@ function addNamespaceToActionDefinition(def) {
   }));
 }
 function getInterfaceParameterName(def, parameter) {
+  if (def.useNonNamespacedParameters) {
+    return getNonNamespacedParameterName(def, parameter);
+  }
   return isTargetParameter(parameter) || !Object.keys(def.interfaceType.propertiesV2).includes(addNamespaceIfNone(parameter)) ? parameter : addNamespaceIfNone(parameter);
 }
+function getNonNamespacedParameterName(def, parameter) {
+  return def.conflictingParameterOverrides?.[parameter] ?? (parameter.split(".").pop() || parameter);
+}
 function convertMappingValue(value) {
   switch (value.type) {
     case "uuid":
@@ -3884,8 +2775,9 @@ function defineCreateInterfaceObjectAction(def) {
   addNamespaceToActionDefinition(def);
   const allProperties = getFlattenedInterfaceProperties(def.interfaceType);
   validateActionParameters(def, Object.keys(allProperties), def.interfaceType.apiName);
-  const propertyParameters = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
-  const parameterNames = new Set(propertyParameters);
+  const sptNames = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
+  const parameterNames = new Set(sptNames.map((apiName) => getInterfaceParameterName(def, apiName)));
+  const propertyMap = Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [getInterfaceParameterName(def, id), prop.sharedPropertyType]));
   Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(getInterfaceParameterName(def, param)));
   parameterNames.add(CREATE_INTERFACE_OBJECT_PARAMETER);
   const actionApiName = def.apiName ?? `create-${kebab(def.interfaceType.apiName.split(".").pop() ?? def.interfaceType.apiName)}${def.objectType === void 0 ? "" : `-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`}`;
@@ -3895,7 +2787,7 @@ function defineCreateInterfaceObjectAction(def) {
     }
     validateParameterOrdering(def.parameterOrdering, parameterNames, actionApiName);
   }
-  const parameters = createParameters(def, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.sharedPropertyType])), parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
+  const parameters = createParameters(def, propertyMap, parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
   const mappings = Object.fromEntries(Object.entries(def.nonParameterMappings ?? {}).map(([id, value]) => [id, convertMappingValue(value)]));
   return defineAction({
     apiName: actionApiName,
@@ -3914,15 +2806,15 @@ function defineCreateInterfaceObjectAction(def) {
         interfaceApiName: def.interfaceType.apiName,
         objectTypeParameter: CREATE_INTERFACE_OBJECT_PARAMETER,
         sharedPropertyValues: {
-          ...Object.fromEntries(propertyParameters.map((id) => [id, {
+          ...Object.fromEntries(sptNames.map((id) => [id, {
             type: "parameterId",
-            parameterId: id
+            parameterId: def.useNonNamespacedParameters ? getNonNamespacedParameterName(def, id) : id
           }])),
           ...mappings
         }
       }
     }],
-    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, CREATE_INTERFACE_OBJECT_PARAMETER),
+    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Array.from(parameterNames), parameters, CREATE_INTERFACE_OBJECT_PARAMETER),
     ...def.actionLevelValidation ? {
       validation: convertValidationRule(def.actionLevelValidation, parameters)
     } : {},
@@ -4373,8 +3265,9 @@ function defineModifyInterfaceObjectAction(def) {
   addNamespaceToActionDefinition(def);
   const allProperties = getFlattenedInterfaceProperties(def.interfaceType);
   validateActionParameters(def, Object.keys(allProperties), def.interfaceType.apiName);
-  const propertyParameters = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
-  const parameterNames = new Set(propertyParameters);
+  const sptNames = Object.keys(allProperties).filter((apiName) => isPropertyParameter(def, apiName, allProperties[apiName].sharedPropertyType.type));
+  const parameterNames = new Set(sptNames.map((apiName) => getInterfaceParameterName(def, apiName)));
+  const propertyMap = Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [getInterfaceParameterName(def, id), prop.sharedPropertyType]));
   Object.keys(def.parameterConfiguration ?? {}).forEach((param) => parameterNames.add(getInterfaceParameterName(def, param)));
   parameterNames.add(MODIFY_INTERFACE_OBJECT_PARAMETER);
   const actionApiName = def.apiName ?? `modify-${kebab(def.interfaceType.apiName.split(".").pop() ?? def.interfaceType.apiName)}${def.objectType === void 0 ? "" : `-${kebab(def.objectType.apiName.split(".").pop() ?? def.objectType.apiName)}`}`;
@@ -4384,7 +3277,7 @@ function defineModifyInterfaceObjectAction(def) {
     }
     validateParameterOrdering(def.parameterOrdering, parameterNames, actionApiName);
   }
-  const parameters = createParameters(def, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.sharedPropertyType])), parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
+  const parameters = createParameters(def, propertyMap, parameterNames, Object.fromEntries(Object.entries(allProperties).map(([id, prop]) => [id, prop.required])));
   const mappings = Object.fromEntries(Object.entries(def.nonParameterMappings ?? {}).map(([id, value]) => [id, convertMappingValue(value)]));
   return defineAction({
     apiName: actionApiName,
@@ -4402,15 +3295,15 @@ function defineModifyInterfaceObjectAction(def) {
       modifyInterfaceRule: {
         interfaceObjectToModifyParameter: "interfaceObjectToModifyParameter",
         sharedPropertyValues: {
-          ...Object.fromEntries(propertyParameters.map((id) => [id, {
+          ...Object.fromEntries(sptNames.map((id) => [id, {
             type: "parameterId",
-            parameterId: id
+            parameterId: def.useNonNamespacedParameters ? getNonNamespacedParameterName(def, id) : id
           }])),
           ...mappings
         }
       }
     }],
-    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Object.keys(allProperties), parameters, MODIFY_INTERFACE_OBJECT_PARAMETER),
+    parameterOrdering: def.parameterOrdering ?? createDefaultParameterOrdering(def, Array.from(parameterNames), parameters, MODIFY_INTERFACE_OBJECT_PARAMETER),
     ...def.actionLevelValidation ? {
       validation: convertValidationRule(def.actionLevelValidation, parameters)
     } : {},
@@ -4640,14 +3533,6 @@ function wrapWithProxy(entity) {
     }
   });
 }
-/*! Bundled license information:
-
-mustache/mustache.mjs:
-  (*!
-   * mustache.js - Logic-less {{mustache}} templates with JavaScript
-   * http://github.com/janl/mustache.js
-   *)
-*/
 
 exports.CREATE_INTERFACE_OBJECT_PARAMETER = CREATE_INTERFACE_OBJECT_PARAMETER;
 exports.CREATE_OR_MODIFY_OBJECT_PARAMETER = CREATE_OR_MODIFY_OBJECT_PARAMETER;