@osdk/generator 2.0.2-rc.3 → 2.1.0-beta.0

package/CHANGELOG.md

@@ -1,42 +1,19 @@
 # @osdk/generator
 
-## 2.0.2-rc.3
+## 2.1.0-beta.0
 
-### Patch Changes
-
-- Updated dependencies [4c5e0ae]
-  - @osdk/api@2.0.2-rc.3
-  - @osdk/generator-converters@2.0.2-rc.3
-
-## 2.0.2-beta.2
-
-### Patch Changes
-
-- Updated dependencies [51354c5]
-  - @osdk/generator-converters@2.0.2-beta.2
-  - @osdk/api@2.0.2-beta.2
-
-## 2.0.2-beta.1
-
-### Patch Changes
-
-- @osdk/generator-converters@2.0.2-beta.1
-- @osdk/api@2.0.2-beta.1
-
-## 2.0.2-rc.0
-
-### Patch Changes
-
-- @osdk/generator-converters@2.0.2-rc.0
-- @osdk/api@2.0.2-rc.0
+### Minor Changes
 
-## 2.0.1
+- 0dc40b0: Switch to OSDK.Instance
 
 ### Patch Changes
 
-- @osdk/internal.foundry.core@0.2.1
-- @osdk/generator-converters@2.0.1
-- @osdk/api@2.0.1
+- Updated dependencies [0dc40b0]
+- Updated dependencies [03e1941]
+- Updated dependencies [e548b9b]
+- Updated dependencies [c682504]
+  - @osdk/api@2.1.0-beta.0
+  - @osdk/generator-converters@2.1.0-beta.0
 
 ## 2.0.0
 

package/build/browser/GenerateContext/EnhanceCommon.d.ts

@@ -1,7 +1,5 @@
 import type { EnhancedOntologyDefinition } from "./EnhancedOntologyDefinition.js";
 export interface EnhanceCommon {
-    ontologyApiNamespace: string | undefined;
-    apiNamespacePackageMap: Map<string, string>;
     importExt: string;
     /** DO NOT USE THIS IN THE CONSTRUCTOR(S) */
     enhancedOntology: EnhancedOntologyDefinition;

package/build/browser/GenerateContext/EnhanceCommon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnhanceCommon.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/EnhanceCommon.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,MAAM,WAAW,aAAa;IAC5B,oBAAoB,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,gBAAgB,EAAE,0BAA0B,CAAC;CAC9C"}
+{"version":3,"file":"EnhanceCommon.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/EnhanceCommon.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAElF,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,gBAAgB,EAAE,0BAA0B,CAAC;CAC9C"}

package/build/browser/GenerateContext/EnhancedBase.d.ts

@@ -10,9 +10,7 @@ export declare abstract class AbstractImportable {
      */
     importPath: string;
     uniqueImportName: string;
-    readonly isLocal: boolean;
-    readonly sourcePackage: string | undefined;
-    constructor(common: EnhanceCommon, fullApiName: string, basePath: string);
+    constructor(common: EnhanceCommon, fullApiName: string, basePath: string, isLocal?: boolean);
     getImportPathRelTo: (filePath: string) => string;
 }
 export declare abstract class EnhancedBase<T> extends AbstractImportable {

package/build/browser/GenerateContext/EnhancedBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedBase.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/EnhancedBase.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,8BAAsB,kBAAkB;IACtC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAEjC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IAEzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGzC,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;IAqBlB,kBAAkB,aAAc,MAAM,YAapC;CACH;AAED,8BAAsB,YAAY,CAAC,CAAC,CAAE,SAAQ,kBAAkB;IAC9D,GAAG,EAAE,CAAC,CAAC;gBAGL,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,CAAC,EACN,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;CAWnB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,GAChB,CAAC,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC,CAI9B"}
+{"version":3,"file":"EnhancedBase.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/EnhancedBase.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,8BAAsB,kBAAkB;IACtC,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC;IAEjC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC;;;OAGG;IACH,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;gBAGvB,MAAM,EAAE,aAAa,EACrB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,OAAc;IAiBzB,kBAAkB,aAAc,MAAM,YAapC;CACH;AAED,8BAAsB,YAAY,CAAC,CAAC,CAAE,SAAQ,kBAAkB;IAC9D,GAAG,EAAE,CAAC,CAAC;gBAGL,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,CAAC,EACN,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM;CAKnB;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,GAChB,CAAC,MAAM,GAAG,SAAS,EAAE,MAAM,CAAC,CAI9B"}

package/build/browser/GenerateContext/EnhancedBase.js

@@ -25,20 +25,14 @@ export class AbstractImportable {
    */
   importPath;
   uniqueImportName;
-  isLocal;
-  sourcePackage;
-  constructor(common, fullApiName, basePath) {
+  constructor(common, fullApiName, basePath, isLocal = true) {
     this._common = common;
     this.fullApiName = fullApiName;
     [this.apiNamespace, this.shortApiName] = extractNamespace(this.fullApiName);
     const {
-      ontologyApiNamespace,
-      apiNamespacePackageMap,
       importExt
     } = common;
-    this.isLocal = ontologyApiNamespace === this.apiNamespace;
-    this.sourcePackage = this.apiNamespace && !this.isLocal ? apiNamespacePackageMap.get(this.apiNamespace) : undefined;
-    this.importPath = this.isLocal ? `${basePath}/${this.shortApiName}${importExt}` : this.sourcePackage;
+    this.importPath = isLocal ? `${basePath}/${this.shortApiName}${importExt}` : basePath;
     this.uniqueImportName = this.shortApiName;
   }
   getImportPathRelTo = filePath => {
@@ -59,9 +53,6 @@ export class EnhancedBase extends AbstractImportable {
   constructor(common, raw, fullApiName, basePath) {
     super(common, fullApiName, basePath);
     this.raw = raw;
-    if (!this.isLocal && !this.sourcePackage) {
-      throw new Error(`Expected { ns:'${this.apiNamespace}', shortName: '${this.shortApiName}'} to be in namespace '${common.ontologyApiNamespace}' or in a provided package mapping`);
-    }
   }
 }
 export function extractNamespace(fqApiName) {

package/build/browser/GenerateContext/EnhancedBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedBase.js","names":["path","AbstractImportable","_common","shortApiName","fullApiName","apiNamespace","importPath","uniqueImportName","isLocal","sourcePackage","constructor","common","basePath","extractNamespace","ontologyApiNamespace","apiNamespacePackageMap","importExt","get","undefined","getImportPathRelTo","filePath","startsWith","result","relative","dirname","split","sep","join","EnhancedBase","raw","Error","fqApiName","last","lastIndexOf","slice"],"sources":["EnhancedBase.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport * as path from \"node:path\";\nexport class AbstractImportable {\n    _common;\n    shortApiName;\n    fullApiName;\n    apiNamespace;\n    /**\n     * Either a path relative to the ourDir (e.g. \"./ontology/objects/foo.js\") or a normal\n     * module import (e.g. \"@something/foo\")/\n     */\n    importPath;\n    uniqueImportName;\n    isLocal;\n    sourcePackage;\n    constructor(common, fullApiName, basePath) {\n        this._common = common;\n        this.fullApiName = fullApiName;\n        [this.apiNamespace, this.shortApiName] = extractNamespace(this.fullApiName);\n        const { ontologyApiNamespace, apiNamespacePackageMap, importExt } = common;\n        this.isLocal = ontologyApiNamespace === this.apiNamespace;\n        this.sourcePackage = this.apiNamespace && !this.isLocal\n            ? apiNamespacePackageMap.get(this.apiNamespace)\n            : undefined;\n        this.importPath = this.isLocal\n            ? `${basePath}/${this.shortApiName}${importExt}`\n            : this.sourcePackage;\n        this.uniqueImportName = this.shortApiName;\n    }\n    getImportPathRelTo = (filePath) => {\n        if (this.importPath.startsWith(\".\")) {\n            const result = path.relative(path.dirname(filePath), this.importPath)\n                .split(path.sep).join(\"/\");\n            if (result.startsWith(\".\")) {\n                return result;\n            }\n            else {\n                return `./${result}`;\n            }\n        }\n        else {\n            return this.importPath;\n        }\n    };\n}\nexport class EnhancedBase extends AbstractImportable {\n    raw;\n    constructor(common, raw, fullApiName, basePath) {\n        super(common, fullApiName, basePath);\n        this.raw = raw;\n        if (!this.isLocal && !this.sourcePackage) {\n            throw new Error(`Expected { ns:'${this.apiNamespace}', shortName: '${this.shortApiName}'} to be in namespace '${common.ontologyApiNamespace}' or in a provided package mapping`);\n        }\n    }\n}\nexport function extractNamespace(fqApiName) {\n    const last = fqApiName.lastIndexOf(\".\");\n    if (last === -1)\n        return [undefined, fqApiName];\n    return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,KAAKA,IAAI,MAAM,WAAW;AACjC,OAAO,MAAMC,kBAAkB,CAAC;EAC5BC,OAAO;EACPC,YAAY;EACZC,WAAW;EACXC,YAAY;EACZ;AACJ;AACA;AACA;EACIC,UAAU;EACVC,gBAAgB;EAChBC,OAAO;EACPC,aAAa;EACbC,WAAWA,CAACC,MAAM,EAAEP,WAAW,EAAEQ,QAAQ,EAAE;IACvC,IAAI,CAACV,OAAO,GAAGS,MAAM;IACrB,IAAI,CAACP,WAAW,GAAGA,WAAW;IAC9B,CAAC,IAAI,CAACC,YAAY,EAAE,IAAI,CAACF,YAAY,CAAC,GAAGU,gBAAgB,CAAC,IAAI,CAACT,WAAW,CAAC;IAC3E,MAAM;MAAEU,oBAAoB;MAAEC,sBAAsB;MAAEC;IAAU,CAAC,GAAGL,MAAM;IAC1E,IAAI,CAACH,OAAO,GAAGM,oBAAoB,KAAK,IAAI,CAACT,YAAY;IACzD,IAAI,CAACI,aAAa,GAAG,IAAI,CAACJ,YAAY,IAAI,CAAC,IAAI,CAACG,OAAO,GACjDO,sBAAsB,CAACE,GAAG,CAAC,IAAI,CAACZ,YAAY,CAAC,GAC7Ca,SAAS;IACf,IAAI,CAACZ,UAAU,GAAG,IAAI,CAACE,OAAO,GACxB,GAAGI,QAAQ,IAAI,IAAI,CAACT,YAAY,GAAGa,SAAS,EAAE,GAC9C,IAAI,CAACP,aAAa;IACxB,IAAI,CAACF,gBAAgB,GAAG,IAAI,CAACJ,YAAY;EAC7C;EACAgB,kBAAkB,GAAIC,QAAQ,IAAK;IAC/B,IAAI,IAAI,CAACd,UAAU,CAACe,UAAU,CAAC,GAAG,CAAC,EAAE;MACjC,MAAMC,MAAM,GAAGtB,IAAI,CAACuB,QAAQ,CAACvB,IAAI,CAACwB,OAAO,CAACJ,QAAQ,CAAC,EAAE,IAAI,CAACd,UAAU,CAAC,CAChEmB,KAAK,CAACzB,IAAI,CAAC0B,GAAG,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;MAC9B,IAAIL,MAAM,CAACD,UAAU,CAAC,GAAG,CAAC,EAAE;QACxB,OAAOC,MAAM;MACjB,CAAC,MACI;QACD,OAAO,KAAKA,MAAM,EAAE;MACxB;IACJ,CAAC,MACI;MACD,OAAO,IAAI,CAAChB,UAAU;IAC1B;EACJ,CAAC;AACL;AACA,OAAO,MAAMsB,YAAY,SAAS3B,kBAAkB,CAAC;EACjD4B,GAAG;EACHnB,WAAWA,CAACC,MAAM,EAAEkB,GAAG,EAAEzB,WAAW,EAAEQ,QAAQ,EAAE;IAC5C,KAAK,CAACD,MAAM,EAAEP,WAAW,EAAEQ,QAAQ,CAAC;IACpC,IAAI,CAACiB,GAAG,GAAGA,GAAG;IACd,IAAI,CAAC,IAAI,CAACrB,OAAO,IAAI,CAAC,IAAI,CAACC,aAAa,EAAE;MACtC,MAAM,IAAIqB,KAAK,CAAC,kBAAkB,IAAI,CAACzB,YAAY,kBAAkB,IAAI,CAACF,YAAY,0BAA0BQ,MAAM,CAACG,oBAAoB,oCAAoC,CAAC;IACpL;EACJ;AACJ;AACA,OAAO,SAASD,gBAAgBA,CAACkB,SAAS,EAAE;EACxC,MAAMC,IAAI,GAAGD,SAAS,CAACE,WAAW,CAAC,GAAG,CAAC;EACvC,IAAID,IAAI,KAAK,CAAC,CAAC,EACX,OAAO,CAACd,SAAS,EAAEa,SAAS,CAAC;EACjC,OAAO,CAACA,SAAS,CAACG,KAAK,CAAC,CAAC,EAAEF,IAAI,CAAC,EAAED,SAAS,CAACG,KAAK,CAACF,IAAI,GAAG,CAAC,CAAC,CAAC;AAChE","ignoreList":[]}
+{"version":3,"file":"EnhancedBase.js","names":["path","AbstractImportable","_common","shortApiName","fullApiName","apiNamespace","importPath","uniqueImportName","constructor","common","basePath","isLocal","extractNamespace","importExt","getImportPathRelTo","filePath","startsWith","result","relative","dirname","split","sep","join","EnhancedBase","raw","fqApiName","last","lastIndexOf","undefined","slice"],"sources":["EnhancedBase.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport * as path from \"node:path\";\nexport class AbstractImportable {\n    _common;\n    shortApiName;\n    fullApiName;\n    apiNamespace;\n    /**\n     * Either a path relative to the ourDir (e.g. \"./ontology/objects/foo.js\") or a normal\n     * module import (e.g. \"@something/foo\")/\n     */\n    importPath;\n    uniqueImportName;\n    constructor(common, fullApiName, basePath, isLocal = true) {\n        this._common = common;\n        this.fullApiName = fullApiName;\n        [this.apiNamespace, this.shortApiName] = extractNamespace(this.fullApiName);\n        const { importExt } = common;\n        this.importPath = isLocal\n            ? `${basePath}/${this.shortApiName}${importExt}`\n            : basePath;\n        this.uniqueImportName = this.shortApiName;\n    }\n    getImportPathRelTo = (filePath) => {\n        if (this.importPath.startsWith(\".\")) {\n            const result = path.relative(path.dirname(filePath), this.importPath)\n                .split(path.sep).join(\"/\");\n            if (result.startsWith(\".\")) {\n                return result;\n            }\n            else {\n                return `./${result}`;\n            }\n        }\n        else {\n            return this.importPath;\n        }\n    };\n}\nexport class EnhancedBase extends AbstractImportable {\n    raw;\n    constructor(common, raw, fullApiName, basePath) {\n        super(common, fullApiName, basePath);\n        this.raw = raw;\n    }\n}\nexport function extractNamespace(fqApiName) {\n    const last = fqApiName.lastIndexOf(\".\");\n    if (last === -1)\n        return [undefined, fqApiName];\n    return [fqApiName.slice(0, last), fqApiName.slice(last + 1)];\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,KAAKA,IAAI,MAAM,WAAW;AACjC,OAAO,MAAMC,kBAAkB,CAAC;EAC5BC,OAAO;EACPC,YAAY;EACZC,WAAW;EACXC,YAAY;EACZ;AACJ;AACA;AACA;EACIC,UAAU;EACVC,gBAAgB;EAChBC,WAAWA,CAACC,MAAM,EAAEL,WAAW,EAAEM,QAAQ,EAAEC,OAAO,GAAG,IAAI,EAAE;IACvD,IAAI,CAACT,OAAO,GAAGO,MAAM;IACrB,IAAI,CAACL,WAAW,GAAGA,WAAW;IAC9B,CAAC,IAAI,CAACC,YAAY,EAAE,IAAI,CAACF,YAAY,CAAC,GAAGS,gBAAgB,CAAC,IAAI,CAACR,WAAW,CAAC;IAC3E,MAAM;MAAES;IAAU,CAAC,GAAGJ,MAAM;IAC5B,IAAI,CAACH,UAAU,GAAGK,OAAO,GACnB,GAAGD,QAAQ,IAAI,IAAI,CAACP,YAAY,GAAGU,SAAS,EAAE,GAC9CH,QAAQ;IACd,IAAI,CAACH,gBAAgB,GAAG,IAAI,CAACJ,YAAY;EAC7C;EACAW,kBAAkB,GAAIC,QAAQ,IAAK;IAC/B,IAAI,IAAI,CAACT,UAAU,CAACU,UAAU,CAAC,GAAG,CAAC,EAAE;MACjC,MAAMC,MAAM,GAAGjB,IAAI,CAACkB,QAAQ,CAAClB,IAAI,CAACmB,OAAO,CAACJ,QAAQ,CAAC,EAAE,IAAI,CAACT,UAAU,CAAC,CAChEc,KAAK,CAACpB,IAAI,CAACqB,GAAG,CAAC,CAACC,IAAI,CAAC,GAAG,CAAC;MAC9B,IAAIL,MAAM,CAACD,UAAU,CAAC,GAAG,CAAC,EAAE;QACxB,OAAOC,MAAM;MACjB,CAAC,MACI;QACD,OAAO,KAAKA,MAAM,EAAE;MACxB;IACJ,CAAC,MACI;MACD,OAAO,IAAI,CAACX,UAAU;IAC1B;EACJ,CAAC;AACL;AACA,OAAO,MAAMiB,YAAY,SAAStB,kBAAkB,CAAC;EACjDuB,GAAG;EACHhB,WAAWA,CAACC,MAAM,EAAEe,GAAG,EAAEpB,WAAW,EAAEM,QAAQ,EAAE;IAC5C,KAAK,CAACD,MAAM,EAAEL,WAAW,EAAEM,QAAQ,CAAC;IACpC,IAAI,CAACc,GAAG,GAAGA,GAAG;EAClB;AACJ;AACA,OAAO,SAASZ,gBAAgBA,CAACa,SAAS,EAAE;EACxC,MAAMC,IAAI,GAAGD,SAAS,CAACE,WAAW,CAAC,GAAG,CAAC;EACvC,IAAID,IAAI,KAAK,CAAC,CAAC,EACX,OAAO,CAACE,SAAS,EAAEH,SAAS,CAAC;EACjC,OAAO,CAACA,SAAS,CAACI,KAAK,CAAC,CAAC,EAAEH,IAAI,CAAC,EAAED,SAAS,CAACI,KAAK,CAACH,IAAI,GAAG,CAAC,CAAC,CAAC;AAChE","ignoreList":[]}

package/build/browser/GenerateContext/EnhancedOntologyDefinition.d.ts

@@ -10,14 +10,14 @@ import { ForeignType } from "./ForeignType.js";
 export declare class EnhancedOntologyDefinition {
     #private;
     ontology: OntologyV2;
-    objectTypes: Record<string, EnhancedObjectType>;
+    objectTypes: Record<string, EnhancedObjectType | ForeignType>;
     actionTypes: Record<string, EnhancedAction>;
     queryTypes: Record<string, EnhancedQuery>;
-    interfaceTypes: Record<string, EnhancedInterfaceType>;
-    sharedPropertyTypes: Record<string, EnhancedSharedPropertyType>;
+    interfaceTypes: Record<string, EnhancedInterfaceType | ForeignType>;
+    sharedPropertyTypes: Record<string, EnhancedSharedPropertyType | ForeignType>;
     raw: WireOntologyDefinition;
     common: EnhanceCommon;
-    constructor(raw: WireOntologyDefinition, ontologyApiNamespace: string | undefined, apiNamespacePackageMap: Map<string, string>, importExt: string);
+    constructor(raw: WireOntologyDefinition, importExt: string, externalObjects?: Map<string, string>, externalInterfaces?: Map<string, string>, externalSpts?: Map<string, string>);
     requireObjectType: <L extends boolean = false>(fullApiName: string, localOnly?: L | undefined) => L extends true ? this["objectTypes"][string] : ForeignType;
     requireInterfaceType: <L extends boolean = false>(fullApiName: string, localOnly?: L | undefined) => L extends true ? this["interfaceTypes"][string] : ForeignType;
     requireActionType: <L extends boolean = false>(fullApiName: string, localOnly?: L | undefined) => L extends true ? this["actionTypes"][string] : ForeignType;

package/build/browser/GenerateContext/EnhancedOntologyDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedOntologyDefinition.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/EnhancedOntologyDefinition.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,0BAA0B;;IACrC,QAAQ,EAAE,UAAU,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAChD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IACtD,mBAAmB,EAAE,MAAM,CACzB,MAAM,EACN,0BAA0B,CAC3B,CAAC;IAGF,GAAG,EAAE,sBAAsB,CAAC;IAC5B,MAAM,EAAE,aAAa,CAAC;gBAGpB,GAAG,EAAE,sBAAsB,EAC3B,oBAAoB,EAAE,MAAM,GAAG,SAAS,EACxC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3C,SAAS,EAAE,MAAM;IAkFZ,iBAAiB,GAnCd,CAAC,SAAS,OAAO,uBACV,MAAM,2FAkC2C;IAC3D,oBAAoB,GApCjB,CAAC,SAAS,OAAO,uBACV,MAAM,8FAmCiD;IACjE,iBAAiB,GArCd,CAAC,SAAS,OAAO,uBACV,MAAM,2FAoC2C;IAC3D,gBAAgB,GAtCb,CAAC,SAAS,OAAO,uBACV,MAAM,0FAqCyC;IACzD,yBAAyB,GAvCtB,CAAC,SAAS,OAAO,uBACV,MAAM,mGAwCrB;CACH"}
+{"version":3,"file":"EnhancedOntologyDefinition.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/EnhancedOntologyDefinition.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,qBAAa,0BAA0B;;IACrC,QAAQ,EAAE,UAAU,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,WAAW,CAAC,CAAC;IAC9D,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAC1C,cAAc,EAAE,MAAM,CACpB,MAAM,EACN,qBAAqB,GAAG,WAAW,CACpC,CAAC;IACF,mBAAmB,EAAE,MAAM,CACzB,MAAM,EACN,0BAA0B,GAAG,WAAW,CACzC,CAAC;IAGF,GAAG,EAAE,sBAAsB,CAAC;IAC5B,MAAM,EAAE,aAAa,CAAC;gBAGpB,GAAG,EAAE,sBAAsB,EAC3B,SAAS,EAAE,MAAM,EACjB,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxC,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAiE7B,iBAAiB,GAjBd,CAAC,SAAS,OAAO,uBACV,MAAM,2FAgB2C;IAC3D,oBAAoB,GAlBjB,CAAC,SAAS,OAAO,uBACV,MAAM,8FAiBiD;IACjE,iBAAiB,GAnBd,CAAC,SAAS,OAAO,uBACV,MAAM,2FAkB2C;IAC3D,gBAAgB,GApBb,CAAC,SAAS,OAAO,uBACV,MAAM,0FAmByC;IACzD,yBAAyB,GArBtB,CAAC,SAAS,OAAO,uBACV,MAAM,mGAsBrB;CACH"}

package/build/browser/GenerateContext/EnhancedOntologyDefinition.js

@@ -30,35 +30,25 @@ export class EnhancedOntologyDefinition {
   #foreignTypes = {};
   raw;
   common;
-  constructor(raw, ontologyApiNamespace, apiNamespacePackageMap, importExt) {
+  constructor(raw, importExt, externalObjects, externalInterfaces, externalSpts) {
     this.common = {
-      apiNamespacePackageMap,
       enhancedOntology: this,
-      importExt,
-      ontologyApiNamespace
+      importExt
     };
     this.raw = raw;
     this.ontology = raw.ontology;
-    this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType);
+    this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType, externalObjects);
     this.actionTypes = remap(raw.actionTypes, this.common, EnhancedAction);
     this.queryTypes = remap(raw.queryTypes, this.common, EnhancedQuery);
-    this.interfaceTypes = remap(raw.interfaceTypes, this.common, EnhancedInterfaceType);
-    this.sharedPropertyTypes = remap(raw.sharedPropertyTypes, this.common, EnhancedSharedPropertyType);
+    this.interfaceTypes = remap(raw.interfaceTypes, this.common, EnhancedInterfaceType, externalInterfaces);
+    this.sharedPropertyTypes = remap(raw.sharedPropertyTypes, this.common, EnhancedSharedPropertyType, externalSpts);
   }
   #createRequireType = type => {
-    return (fullApiName, localOnly) => {
+    return fullApiName => {
       const ret = this[type][fullApiName];
       if (!ret) {
         const [apiNamespace, shortApiName] = extractNamespace(fullApiName);
-        if (localOnly || !apiNamespace) {
-          throw new Error(`Unable to find ${type}: No entry for '${fullApiName}`);
-        }
-        if (!this.common.apiNamespacePackageMap.has(apiNamespace)) {
-          throw new Error(`Unable to find ${type}: Unknown namespace '${apiNamespace}'`);
-        }
-        const ret = this.#foreignTypes[fullApiName] ?? new ForeignType(this.common, type, apiNamespace, shortApiName);
-        this.#foreignTypes[fullApiName] = ret;
-        return ret;
+        throw new Error(`Unable to find ${type}: No entry for '${fullApiName}`);
       }
       return ret;
     };
@@ -69,9 +59,25 @@ export class EnhancedOntologyDefinition {
   requireQueryType = this.#createRequireType("queryTypes");
   requireSharedPropertyType = this.#createRequireType("sharedPropertyTypes");
 }
-function remap(r, common, Constructor) {
-  return Object.fromEntries(Object.entries(r ?? {}).map(([fullApiName, v]) => {
-    return [fullApiName, new Constructor(common, v)];
-  }).sort((a, b) => a[0].localeCompare(b[0])));
+function remap(r, common, Constructor, externalMap) {
+  const entries = [];
+  for (const [fullApiName, v] of Object.entries(r ?? {})) {
+    if (!externalMap?.has(fullApiName)) {
+      entries.push([fullApiName, new Constructor(common, v)]);
+    } // skip it, we handle it below
+  }
+  if (externalMap) {
+    for (const [fullApiName, destPackage] of externalMap) {
+      const [apiNamespace, shortApiName] = extractNamespace(fullApiName);
+      // I think this check should be required but the ontology manager / dev console doesn't enforce it right now
+      // if (apiNamespace === undefined) {
+      //   throw new Error(
+      //     `Cannot reference an external type (${fullApiName}) that is missing a namespace`,
+      //   );
+      // }
+      entries.push([fullApiName, new ForeignType(common, apiNamespace, shortApiName, destPackage)]);
+    }
+  }
+  return Object.fromEntries(entries.sort((a, b) => a[0].localeCompare(b[0])));
 }
 //# sourceMappingURL=EnhancedOntologyDefinition.js.map

package/build/browser/GenerateContext/EnhancedOntologyDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"EnhancedOntologyDefinition.js","names":["EnhancedAction","extractNamespace","EnhancedInterfaceType","EnhancedObjectType","EnhancedQuery","EnhancedSharedPropertyType","ForeignType","EnhancedOntologyDefinition","ontology","objectTypes","actionTypes","queryTypes","interfaceTypes","sharedPropertyTypes","foreignTypes","raw","common","constructor","ontologyApiNamespace","apiNamespacePackageMap","importExt","enhancedOntology","remap","createRequireType","type","fullApiName","localOnly","ret","apiNamespace","shortApiName","Error","has","requireObjectType","requireInterfaceType","requireActionType","requireQueryType","requireSharedPropertyType","r","Constructor","Object","fromEntries","entries","map","v","sort","a","b","localeCompare"],"sources":["EnhancedOntologyDefinition.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { EnhancedAction } from \"./EnhancedAction.js\";\nimport { extractNamespace } from \"./EnhancedBase.js\";\nimport { EnhancedInterfaceType } from \"./EnhancedInterfaceType.js\";\nimport { EnhancedObjectType } from \"./EnhancedObjectType.js\";\nimport { EnhancedQuery } from \"./EnhancedQuery.js\";\nimport { EnhancedSharedPropertyType } from \"./EnhancedSharedPropertyType.js\";\nimport { ForeignType } from \"./ForeignType.js\";\nexport class EnhancedOntologyDefinition {\n    ontology;\n    objectTypes;\n    actionTypes;\n    queryTypes;\n    interfaceTypes;\n    sharedPropertyTypes;\n    #foreignTypes = {};\n    raw;\n    common;\n    constructor(raw, ontologyApiNamespace, apiNamespacePackageMap, importExt) {\n        this.common = {\n            apiNamespacePackageMap,\n            enhancedOntology: this,\n            importExt,\n            ontologyApiNamespace,\n        };\n        this.raw = raw;\n        this.ontology = raw.ontology;\n        this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType);\n        this.actionTypes = remap(raw.actionTypes, this.common, EnhancedAction);\n        this.queryTypes = remap(raw.queryTypes, this.common, EnhancedQuery);\n        this.interfaceTypes = remap(raw.interfaceTypes, this.common, EnhancedInterfaceType);\n        this.sharedPropertyTypes = remap(raw.sharedPropertyTypes, this.common, EnhancedSharedPropertyType);\n    }\n    #createRequireType = (type) => {\n        return (fullApiName, localOnly) => {\n            const ret = this[type][fullApiName];\n            if (!ret) {\n                const [apiNamespace, shortApiName] = extractNamespace(fullApiName);\n                if (localOnly || !apiNamespace) {\n                    throw new Error(`Unable to find ${type}: No entry for '${fullApiName}`);\n                }\n                if (!this.common.apiNamespacePackageMap.has(apiNamespace)) {\n                    throw new Error(`Unable to find ${type}: Unknown namespace '${apiNamespace}'`);\n                }\n                const ret = this.#foreignTypes[fullApiName] ?? new ForeignType(this.common, type, apiNamespace, shortApiName);\n                this.#foreignTypes[fullApiName] = ret;\n                return ret;\n            }\n            return ret;\n        };\n    };\n    requireObjectType = this.#createRequireType(\"objectTypes\");\n    requireInterfaceType = this.#createRequireType(\"interfaceTypes\");\n    requireActionType = this.#createRequireType(\"actionTypes\");\n    requireQueryType = this.#createRequireType(\"queryTypes\");\n    requireSharedPropertyType = this.#createRequireType(\"sharedPropertyTypes\");\n}\nfunction remap(r, common, Constructor) {\n    return Object.fromEntries(Object.entries(r ?? {}).map(([fullApiName, v]) => {\n        return [\n            fullApiName,\n            new Constructor(common, v),\n        ];\n    }).sort((a, b) => a[0].localeCompare(b[0])));\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"EnhancedOntologyDefinition.js","names":["EnhancedAction","extractNamespace","EnhancedInterfaceType","EnhancedObjectType","EnhancedQuery","EnhancedSharedPropertyType","ForeignType","EnhancedOntologyDefinition","ontology","objectTypes","actionTypes","queryTypes","interfaceTypes","sharedPropertyTypes","foreignTypes","raw","common","constructor","importExt","externalObjects","externalInterfaces","externalSpts","enhancedOntology","remap","createRequireType","type","fullApiName","ret","apiNamespace","shortApiName","Error","requireObjectType","requireInterfaceType","requireActionType","requireQueryType","requireSharedPropertyType","r","Constructor","externalMap","entries","v","Object","has","push","destPackage","fromEntries","sort","a","b","localeCompare"],"sources":["EnhancedOntologyDefinition.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { EnhancedAction } from \"./EnhancedAction.js\";\nimport { extractNamespace } from \"./EnhancedBase.js\";\nimport { EnhancedInterfaceType } from \"./EnhancedInterfaceType.js\";\nimport { EnhancedObjectType } from \"./EnhancedObjectType.js\";\nimport { EnhancedQuery } from \"./EnhancedQuery.js\";\nimport { EnhancedSharedPropertyType } from \"./EnhancedSharedPropertyType.js\";\nimport { ForeignType } from \"./ForeignType.js\";\nexport class EnhancedOntologyDefinition {\n    ontology;\n    objectTypes;\n    actionTypes;\n    queryTypes;\n    interfaceTypes;\n    sharedPropertyTypes;\n    #foreignTypes = {};\n    raw;\n    common;\n    constructor(raw, importExt, externalObjects, externalInterfaces, externalSpts) {\n        this.common = {\n            enhancedOntology: this,\n            importExt,\n        };\n        this.raw = raw;\n        this.ontology = raw.ontology;\n        this.objectTypes = remap(raw.objectTypes, this.common, EnhancedObjectType, externalObjects);\n        this.actionTypes = remap(raw.actionTypes, this.common, EnhancedAction);\n        this.queryTypes = remap(raw.queryTypes, this.common, EnhancedQuery);\n        this.interfaceTypes = remap(raw.interfaceTypes, this.common, EnhancedInterfaceType, externalInterfaces);\n        this.sharedPropertyTypes = remap(raw.sharedPropertyTypes, this.common, EnhancedSharedPropertyType, externalSpts);\n    }\n    #createRequireType = (type) => {\n        return (fullApiName, localOnly) => {\n            const ret = this[type][fullApiName];\n            if (!ret) {\n                const [apiNamespace, shortApiName] = extractNamespace(fullApiName);\n                throw new Error(`Unable to find ${type}: No entry for '${fullApiName}`);\n            }\n            return ret;\n        };\n    };\n    requireObjectType = this.#createRequireType(\"objectTypes\");\n    requireInterfaceType = this.#createRequireType(\"interfaceTypes\");\n    requireActionType = this.#createRequireType(\"actionTypes\");\n    requireQueryType = this.#createRequireType(\"queryTypes\");\n    requireSharedPropertyType = this.#createRequireType(\"sharedPropertyTypes\");\n}\nfunction remap(r, common, Constructor, externalMap) {\n    const entries = [];\n    for (const [fullApiName, v] of Object.entries(r ?? {})) {\n        if (externalMap?.has(fullApiName)) {\n            // skip it, we handle it below\n        }\n        else {\n            entries.push([fullApiName, new Constructor(common, v)]);\n        }\n    }\n    if (externalMap) {\n        for (const [fullApiName, destPackage] of externalMap) {\n            const [apiNamespace, shortApiName] = extractNamespace(fullApiName);\n            // I think this check should be required but the ontology manager / dev console doesn't enforce it right now\n            // if (apiNamespace === undefined) {\n            //   throw new Error(\n            //     `Cannot reference an external type (${fullApiName}) that is missing a namespace`,\n            //   );\n            // }\n            entries.push([\n                fullApiName,\n                new ForeignType(common, apiNamespace, shortApiName, destPackage),\n            ]);\n        }\n    }\n    return Object.fromEntries(entries.sort((a, b) => a[0].localeCompare(b[0])));\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/GenerateContext/ForeignType.d.ts

@@ -2,8 +2,7 @@ import type { EnhanceCommon } from "./EnhanceCommon.js";
 import { AbstractImportable } from "./EnhancedBase.js";
 export declare class ForeignType extends AbstractImportable {
     _common: EnhanceCommon;
-    readonly type: string;
-    constructor(_common: EnhanceCommon, type: string, apiNamespace: string, shortApiName: string);
+    constructor(_common: EnhanceCommon, apiNamespace: string | undefined, shortApiName: string, destinationPackage: string);
     getImportedDefinitionIdentifier(v2: boolean): string;
     getDefinitionIdentifier(v2: boolean): string;
 }

package/build/browser/GenerateContext/ForeignType.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ForeignType.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/ForeignType.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,qBAAa,WAAY,SAAQ,kBAAkB;IAExC,OAAO,EAAE,aAAa;aACb,IAAI,EAAE,MAAM;gBADrB,OAAO,EAAE,aAAa,EACb,IAAI,EAAE,MAAM,EAC5B,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM;IAStB,+BAA+B,CAAC,EAAE,EAAE,OAAO;IAM3C,uBAAuB,CAAC,EAAE,EAAE,OAAO;CAOpC"}
+{"version":3,"file":"ForeignType.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/ForeignType.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,qBAAa,WAAY,SAAQ,kBAAkB;IAExC,OAAO,EAAE,aAAa;gBAAtB,OAAO,EAAE,aAAa,EAC7B,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,YAAY,EAAE,MAAM,EACpB,kBAAkB,EAAE,MAAM;IAU5B,+BAA+B,CAAC,EAAE,EAAE,OAAO;IAM3C,uBAAuB,CAAC,EAAE,EAAE,OAAO;CAGpC"}

package/build/browser/GenerateContext/ForeignType.js

@@ -16,21 +16,15 @@
 import { AbstractImportable } from "./EnhancedBase.js";
 export class ForeignType extends AbstractImportable {
   _common;
-  type;
-  constructor(_common, type, apiNamespace, shortApiName) {
-    super(_common, `${apiNamespace}.${shortApiName}`, _common.apiNamespacePackageMap.get(apiNamespace));
+  constructor(_common, apiNamespace, shortApiName, destinationPackage) {
+    super(_common, apiNamespace ? `${apiNamespace}.${shortApiName}` : shortApiName, destinationPackage, false);
     this._common = _common;
-    this.type = type;
   }
   getImportedDefinitionIdentifier() {
-    return `$Imported$${this.type}$${this.apiNamespace.replace(/\./g, "$")}$${this.shortApiName}`;
+    return `$Imported$${this.apiNamespace?.replace(/\./g, "$")}$${this.shortApiName}`;
   }
-  getDefinitionIdentifier(v2) {
-    if (this.type === "objectTypes") {
-      return v2 ? this.uniqueImportName : `${this.uniqueImportName}Def`;
-    } else {
-      return this.uniqueImportName;
-    }
+  getDefinitionIdentifier() {
+    return this.uniqueImportName;
   }
 }
 //# sourceMappingURL=ForeignType.js.map

package/build/browser/GenerateContext/ForeignType.js.map

@@ -1 +1 @@
-{"version":3,"file":"ForeignType.js","names":["AbstractImportable","ForeignType","_common","type","constructor","apiNamespace","shortApiName","apiNamespacePackageMap","get","getImportedDefinitionIdentifier","replace","getDefinitionIdentifier","v2","uniqueImportName"],"sources":["ForeignType.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { AbstractImportable } from \"./EnhancedBase.js\";\nexport class ForeignType extends AbstractImportable {\n    _common;\n    type;\n    constructor(_common, type, apiNamespace, shortApiName) {\n        super(_common, `${apiNamespace}.${shortApiName}`, _common.apiNamespacePackageMap.get(apiNamespace));\n        this._common = _common;\n        this.type = type;\n    }\n    getImportedDefinitionIdentifier(v2) {\n        return `$Imported$${this.type}$${this.apiNamespace.replace(/\\./g, \"$\")}$${this.shortApiName}`;\n    }\n    getDefinitionIdentifier(v2) {\n        if (this.type === \"objectTypes\") {\n            return v2 ? this.uniqueImportName : `${this.uniqueImportName}Def`;\n        }\n        else {\n            return this.uniqueImportName;\n        }\n    }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,kBAAkB,QAAQ,mBAAmB;AACtD,OAAO,MAAMC,WAAW,SAASD,kBAAkB,CAAC;EAChDE,OAAO;EACPC,IAAI;EACJC,WAAWA,CAACF,OAAO,EAAEC,IAAI,EAAEE,YAAY,EAAEC,YAAY,EAAE;IACnD,KAAK,CAACJ,OAAO,EAAE,GAAGG,YAAY,IAAIC,YAAY,EAAE,EAAEJ,OAAO,CAACK,sBAAsB,CAACC,GAAG,CAACH,YAAY,CAAC,CAAC;IACnG,IAAI,CAACH,OAAO,GAAGA,OAAO;IACtB,IAAI,CAACC,IAAI,GAAGA,IAAI;EACpB;EACAM,+BAA+BA,CAAA,EAAK;IAChC,OAAO,aAAa,IAAI,CAACN,IAAI,IAAI,IAAI,CAACE,YAAY,CAACK,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,CAACJ,YAAY,EAAE;EACjG;EACAK,uBAAuBA,CAACC,EAAE,EAAE;IACxB,IAAI,IAAI,CAACT,IAAI,KAAK,aAAa,EAAE;MAC7B,OAAOS,EAAE,GAAG,IAAI,CAACC,gBAAgB,GAAG,GAAG,IAAI,CAACA,gBAAgB,KAAK;IACrE,CAAC,MACI;MACD,OAAO,IAAI,CAACA,gBAAgB;IAChC;EACJ;AACJ","ignoreList":[]}
+{"version":3,"file":"ForeignType.js","names":["AbstractImportable","ForeignType","_common","constructor","apiNamespace","shortApiName","destinationPackage","getImportedDefinitionIdentifier","replace","getDefinitionIdentifier","uniqueImportName"],"sources":["ForeignType.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { AbstractImportable } from \"./EnhancedBase.js\";\nexport class ForeignType extends AbstractImportable {\n    _common;\n    constructor(_common, apiNamespace, shortApiName, destinationPackage) {\n        super(_common, apiNamespace ? `${apiNamespace}.${shortApiName}` : shortApiName, destinationPackage, false);\n        this._common = _common;\n    }\n    getImportedDefinitionIdentifier(v2) {\n        return `$Imported$${this.apiNamespace?.replace(/\\./g, \"$\")}$${this.shortApiName}`;\n    }\n    getDefinitionIdentifier(v2) {\n        return this.uniqueImportName;\n    }\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,kBAAkB,QAAQ,mBAAmB;AACtD,OAAO,MAAMC,WAAW,SAASD,kBAAkB,CAAC;EAChDE,OAAO;EACPC,WAAWA,CAACD,OAAO,EAAEE,YAAY,EAAEC,YAAY,EAAEC,kBAAkB,EAAE;IACjE,KAAK,CAACJ,OAAO,EAAEE,YAAY,GAAG,GAAGA,YAAY,IAAIC,YAAY,EAAE,GAAGA,YAAY,EAAEC,kBAAkB,EAAE,KAAK,CAAC;IAC1G,IAAI,CAACJ,OAAO,GAAGA,OAAO;EAC1B;EACAK,+BAA+BA,CAAA,EAAK;IAChC,OAAO,aAAa,IAAI,CAACH,YAAY,EAAEI,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,IAAI,CAACH,YAAY,EAAE;EACrF;EACAI,uBAAuBA,CAAA,EAAK;IACxB,OAAO,IAAI,CAACC,gBAAgB;EAChC;AACJ","ignoreList":[]}

package/build/browser/GenerateContext/enhanceOntology.d.ts

@@ -1,4 +1,10 @@
 import type { WireOntologyDefinition } from "../WireOntologyDefinition.js";
 import { EnhancedOntologyDefinition } from "./EnhancedOntologyDefinition.js";
-export declare function enhanceOntology(sanitized: WireOntologyDefinition, ontologyApiNamespace: string | undefined, apiNamespacePackageMap: Map<string, string>, importExt: string): EnhancedOntologyDefinition;
+export declare function enhanceOntology({ sanitized, importExt, externalObjects, externalInterfaces, externalSpts, }: {
+    sanitized: WireOntologyDefinition;
+    externalObjects?: Map<string, string>;
+    externalInterfaces?: Map<string, string>;
+    externalSpts?: Map<string, string>;
+    importExt: string;
+}): EnhancedOntologyDefinition;
 //# sourceMappingURL=enhanceOntology.d.ts.map

package/build/browser/GenerateContext/enhanceOntology.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enhanceOntology.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/enhanceOntology.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,wBAAgB,eAAe,CAC7B,SAAS,EAAE,sBAAsB,EACjC,oBAAoB,EAAE,MAAM,GAAG,SAAS,EACxC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3C,SAAS,EAAE,MAAM,GAChB,0BAA0B,CAO5B"}
+{"version":3,"file":"enhanceOntology.d.ts","sourceRoot":"","sources":["../../../src/GenerateContext/enhanceOntology.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAE7E,wBAAgB,eAAe,CAC7B,EACE,SAAS,EACT,SAAS,EACT,eAAe,EACf,kBAAkB,EAClB,YAAY,GACb,EAAE;IACD,SAAS,EAAE,sBAAsB,CAAC;IAClC,eAAe,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,kBAAkB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;CACnB,GACA,0BAA0B,CAQ5B"}

package/build/browser/GenerateContext/enhanceOntology.js

@@ -14,7 +14,13 @@
  * limitations under the License.
  */
 import { EnhancedOntologyDefinition } from "./EnhancedOntologyDefinition.js";
-export function enhanceOntology(sanitized, ontologyApiNamespace, apiNamespacePackageMap, importExt) {
-  return new EnhancedOntologyDefinition(sanitized, ontologyApiNamespace, apiNamespacePackageMap, importExt);
+export function enhanceOntology({
+  sanitized,
+  importExt,
+  externalObjects,
+  externalInterfaces,
+  externalSpts
+}) {
+  return new EnhancedOntologyDefinition(sanitized, importExt, externalObjects, externalInterfaces, externalSpts);
 }
 //# sourceMappingURL=enhanceOntology.js.map

package/build/browser/GenerateContext/enhanceOntology.js.map

@@ -1 +1 @@
-{"version":3,"file":"enhanceOntology.js","names":["EnhancedOntologyDefinition","enhanceOntology","sanitized","ontologyApiNamespace","apiNamespacePackageMap","importExt"],"sources":["enhanceOntology.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { EnhancedOntologyDefinition } from \"./EnhancedOntologyDefinition.js\";\nexport function enhanceOntology(sanitized, ontologyApiNamespace, apiNamespacePackageMap, importExt) {\n    return new EnhancedOntologyDefinition(sanitized, ontologyApiNamespace, apiNamespacePackageMap, importExt);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,0BAA0B,QAAQ,iCAAiC;AAC5E,OAAO,SAASC,eAAeA,CAACC,SAAS,EAAEC,oBAAoB,EAAEC,sBAAsB,EAAEC,SAAS,EAAE;EAChG,OAAO,IAAIL,0BAA0B,CAACE,SAAS,EAAEC,oBAAoB,EAAEC,sBAAsB,EAAEC,SAAS,CAAC;AAC7G","ignoreList":[]}
+{"version":3,"file":"enhanceOntology.js","names":["EnhancedOntologyDefinition","enhanceOntology","sanitized","importExt","externalObjects","externalInterfaces","externalSpts"],"sources":["enhanceOntology.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { EnhancedOntologyDefinition } from \"./EnhancedOntologyDefinition.js\";\nexport function enhanceOntology({ sanitized, importExt, externalObjects, externalInterfaces, externalSpts, }) {\n    return new EnhancedOntologyDefinition(sanitized, importExt, externalObjects, externalInterfaces, externalSpts);\n}\n"],"mappings":"AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAASA,0BAA0B,QAAQ,iCAAiC;AAC5E,OAAO,SAASC,eAAeA,CAAC;EAAEC,SAAS;EAAEC,SAAS;EAAEC,eAAe;EAAEC,kBAAkB;EAAEC;AAAc,CAAC,EAAE;EAC1G,OAAO,IAAIN,0BAA0B,CAACE,SAAS,EAAEC,SAAS,EAAEC,eAAe,EAAEC,kBAAkB,EAAEC,YAAY,CAAC;AAClH","ignoreList":[]}

package/build/browser/generateClientSdkPackage.d.ts

@@ -1,6 +1,6 @@
 import type { MinimalFs } from "./MinimalFs.js";
 import type { WireOntologyDefinition } from "./WireOntologyDefinition.js";
-export declare function generateClientSdkPackage(packageName: string, packageVersion: string, sdkVersion: "1.1" | "2.0", baseOutDir: string, ontology: WireOntologyDefinition, minimalFs: MinimalFs, dependencyVersions: DependencyVersions, cliVersion: string, ontologyApiNamespace: string | undefined, apiNamespacePackageMap: Map<string, string>): Promise<void>;
+export declare function generateClientSdkPackage(packageName: string, packageVersion: string, sdkVersion: "1.1" | "2.0", baseOutDir: string, ontology: WireOntologyDefinition, minimalFs: MinimalFs, dependencyVersions: DependencyVersions, cliVersion: string, externalObjects?: Map<string, string>, externalInterfaces?: Map<string, string>): Promise<void>;
 export interface DependencyVersions {
     typescriptVersion: string;
     tslibVersion: string;

package/build/browser/generateClientSdkPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generateClientSdkPackage.d.ts","sourceRoot":"","sources":["../../src/generateClientSdkPackage.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAE1E,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,KAAK,GAAG,KAAK,EACzB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,MAAM,EAClB,oBAAoB,EAAE,MAAM,GAAG,SAAS,EACxC,sBAAsB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,iBA4D5C;AA+BD,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAgB,uBAAuB,CACrC,EACE,cAAc,EACd,iBAAiB,GAClB,EAAE,kBAAkB;;;;;;;;EAWtB;AA0BD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BvC"}
+{"version":3,"file":"generateClientSdkPackage.d.ts","sourceRoot":"","sources":["../../src/generateClientSdkPackage.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAE1E,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,KAAK,GAAG,KAAK,EACzB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,sBAAsB,EAChC,SAAS,EAAE,SAAS,EACpB,kBAAkB,EAAE,kBAAkB,EACtC,UAAU,EAAE,MAAM,EAClB,eAAe,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,EAChD,kBAAkB,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,iBA4DpD;AA+BD,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,uBAAuB,EAAE,MAAM,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAgB,uBAAuB,CACrC,EACE,cAAc,EACd,iBAAiB,GAClB,EAAE,kBAAkB;;;;;;;;EAWtB;AA0BD,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,kBAAkB,EAAE,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BvC"}

package/build/browser/generateClientSdkPackage.js

@@ -16,14 +16,14 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { generateClientSdkVersionTwoPointZero } from "./v2.0/generateClientSdkVersionTwoPointZero.js";
-export async function generateClientSdkPackage(packageName, packageVersion, sdkVersion, baseOutDir, ontology, minimalFs, dependencyVersions, cliVersion, ontologyApiNamespace, apiNamespacePackageMap) {
+export async function generateClientSdkPackage(packageName, packageVersion, sdkVersion, baseOutDir, ontology, minimalFs, dependencyVersions, cliVersion, externalObjects = new Map(), externalInterfaces = new Map()) {
   if (!packageName) throw new Error("Package name is required");
   if (sdkVersion === "1.1") {
     throw new Error("This generator version does not support generating v1 sdks");
   }
   for (const packageType of ["module", "commonjs"]) {
     const outDir = path.join(baseOutDir, "dist", packageType);
-    generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, ontologyApiNamespace, apiNamespacePackageMap);
+    generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, externalObjects, externalInterfaces);
     await fs.promises.mkdir(outDir, {
       recursive: true
     });

package/build/browser/generateClientSdkPackage.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateClientSdkPackage.js","names":["fs","path","generateClientSdkVersionTwoPointZero","generateClientSdkPackage","packageName","packageVersion","sdkVersion","baseOutDir","ontology","minimalFs","dependencyVersions","cliVersion","ontologyApiNamespace","apiNamespacePackageMap","Error","packageType","outDir","join","promises","mkdir","recursive","writeJson","type","compilerOptions","getTsCompilerOptions","getPackageJsonContents","writeFile","commonTsconfig","importHelpers","declaration","isolatedModules","esModuleInterop","forceConsistentCasingInFileNames","strict","skipLibCheck","module","target","getExpectedDependencies","osdkApiVersion","osdkClientVersion","devDependencies","peerDependencies","getExpectedDependenciesFull","typescriptVersion","tslibVersion","areTheTypesWrongVersion","base","name","version","esmPrefix","commonjsPrefix","main","exports","import","require","scripts","prepack","check","files","filePath","body","JSON","stringify","undefined"],"sources":["generateClientSdkPackage.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport { generateClientSdkVersionTwoPointZero } from \"./v2.0/generateClientSdkVersionTwoPointZero.js\";\nexport async function generateClientSdkPackage(packageName, packageVersion, sdkVersion, baseOutDir, ontology, minimalFs, dependencyVersions, cliVersion, ontologyApiNamespace, apiNamespacePackageMap) {\n    if (!packageName)\n        throw new Error(\"Package name is required\");\n    if (sdkVersion === \"1.1\") {\n        throw new Error(\"This generator version does not support generating v1 sdks\");\n    }\n    for (const packageType of [\"module\", \"commonjs\"]) {\n        const outDir = path.join(baseOutDir, \"dist\", packageType);\n        generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, ontologyApiNamespace, apiNamespacePackageMap);\n        await fs.promises.mkdir(outDir, { recursive: true });\n        await writeJson(minimalFs, path.join(outDir, \"package.json\"), { type: packageType });\n        await writeJson(minimalFs, path.join(outDir, `tsconfig.json`), {\n            compilerOptions: getTsCompilerOptions(packageType),\n        });\n    }\n    await writeJson(minimalFs, path.join(baseOutDir, \"package.json\"), await getPackageJsonContents(packageName, packageVersion, dependencyVersions));\n    // we need to shim for the node10 resolver\n    await minimalFs.mkdir(path.join(baseOutDir, \"ontology\"), {\n        recursive: true,\n    });\n    await minimalFs.writeFile(path.join(baseOutDir, \"ontology\", \"objects.js\"), `module.exports = require(\"../../dist/module/ontology/objects\")`);\n    await minimalFs.writeFile(path.join(baseOutDir, \"ontology\", \"objects.d.ts\"), `export * from \"../dist/module/ontology/objects\"`);\n}\nfunction getTsCompilerOptions(packageType) {\n    const commonTsconfig = {\n        importHelpers: true,\n        declaration: true,\n        isolatedModules: true,\n        esModuleInterop: true,\n        forceConsistentCasingInFileNames: true,\n        strict: true,\n        skipLibCheck: true,\n    };\n    const compilerOptions = packageType === \"commonjs\"\n        ? {\n            ...commonTsconfig,\n            module: \"commonjs\",\n            target: \"es2018\",\n        }\n        : {\n            ...commonTsconfig,\n            module: \"NodeNext\",\n            target: \"ES2020\",\n        };\n    return compilerOptions;\n}\nexport function getExpectedDependencies({ osdkApiVersion, osdkClientVersion, }) {\n    return {\n        devDependencies: {\n            \"@osdk/api\": osdkApiVersion,\n        },\n        peerDependencies: {\n            \"@osdk/api\": osdkApiVersion,\n            \"@osdk/client\": osdkClientVersion,\n        },\n    };\n}\nfunction getExpectedDependenciesFull(dependencyVersions) {\n    const { typescriptVersion, tslibVersion, areTheTypesWrongVersion, } = dependencyVersions;\n    const base = getExpectedDependencies(dependencyVersions);\n    return {\n        devDependencies: {\n            ...base.devDependencies,\n            \"typescript\": typescriptVersion,\n            \"tslib\": tslibVersion,\n            \"@arethetypeswrong/cli\": areTheTypesWrongVersion,\n        },\n        peerDependencies: {\n            ...base.peerDependencies,\n        },\n    };\n}\nexport function getPackageJsonContents(name, version, dependencyVersions) {\n    const esmPrefix = \"./dist/module\";\n    const commonjsPrefix = \"./dist/commonjs\";\n    return {\n        name,\n        version,\n        main: `${commonjsPrefix}/index.js`,\n        module: `${esmPrefix}/index.js`,\n        exports: {\n            \".\": {\n                import: `${esmPrefix}/index.js`,\n                require: `${commonjsPrefix}/index.js`,\n            },\n        },\n        scripts: {\n            prepack: `tsc -p ${esmPrefix}/tsconfig.json && tsc -p ${commonjsPrefix}/tsconfig.json`,\n            check: \"npm exec attw $(npm pack)\",\n        },\n        ...getExpectedDependenciesFull(dependencyVersions),\n        files: [\n            \"**/*.js\",\n            \"**/*.d.ts\",\n            \"dist/**/package.json\",\n        ],\n    };\n}\nasync function writeJson(minimalFs, filePath, body) {\n    // consola.info(`Writing ${filePath}`);\n    // consola.debug(`Writing ${filePath} with body`, body);\n    return await minimalFs.writeFile(filePath, JSON.stringify(body, undefined, 2) + \"\\n\");\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"generateClientSdkPackage.js","names":["fs","path","generateClientSdkVersionTwoPointZero","generateClientSdkPackage","packageName","packageVersion","sdkVersion","baseOutDir","ontology","minimalFs","dependencyVersions","cliVersion","externalObjects","Map","externalInterfaces","Error","packageType","outDir","join","promises","mkdir","recursive","writeJson","type","compilerOptions","getTsCompilerOptions","getPackageJsonContents","writeFile","commonTsconfig","importHelpers","declaration","isolatedModules","esModuleInterop","forceConsistentCasingInFileNames","strict","skipLibCheck","module","target","getExpectedDependencies","osdkApiVersion","osdkClientVersion","devDependencies","peerDependencies","getExpectedDependenciesFull","typescriptVersion","tslibVersion","areTheTypesWrongVersion","base","name","version","esmPrefix","commonjsPrefix","main","exports","import","require","scripts","prepack","check","files","filePath","body","JSON","stringify","undefined"],"sources":["generateClientSdkPackage.js"],"sourcesContent":["/*\n * Copyright 2024 Palantir Technologies, Inc. All rights reserved.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport * as fs from \"node:fs\";\nimport * as path from \"node:path\";\nimport { generateClientSdkVersionTwoPointZero } from \"./v2.0/generateClientSdkVersionTwoPointZero.js\";\nexport async function generateClientSdkPackage(packageName, packageVersion, sdkVersion, baseOutDir, ontology, minimalFs, dependencyVersions, cliVersion, externalObjects = new Map(), externalInterfaces = new Map()) {\n    if (!packageName)\n        throw new Error(\"Package name is required\");\n    if (sdkVersion === \"1.1\") {\n        throw new Error(\"This generator version does not support generating v1 sdks\");\n    }\n    for (const packageType of [\"module\", \"commonjs\"]) {\n        const outDir = path.join(baseOutDir, \"dist\", packageType);\n        generateClientSdkVersionTwoPointZero(ontology, `typescript-sdk/${packageVersion} osdk-cli/${cliVersion}`, minimalFs, outDir, packageType, externalObjects, externalInterfaces);\n        await fs.promises.mkdir(outDir, { recursive: true });\n        await writeJson(minimalFs, path.join(outDir, \"package.json\"), { type: packageType });\n        await writeJson(minimalFs, path.join(outDir, `tsconfig.json`), {\n            compilerOptions: getTsCompilerOptions(packageType),\n        });\n    }\n    await writeJson(minimalFs, path.join(baseOutDir, \"package.json\"), await getPackageJsonContents(packageName, packageVersion, dependencyVersions));\n    // we need to shim for the node10 resolver\n    await minimalFs.mkdir(path.join(baseOutDir, \"ontology\"), {\n        recursive: true,\n    });\n    await minimalFs.writeFile(path.join(baseOutDir, \"ontology\", \"objects.js\"), `module.exports = require(\"../../dist/module/ontology/objects\")`);\n    await minimalFs.writeFile(path.join(baseOutDir, \"ontology\", \"objects.d.ts\"), `export * from \"../dist/module/ontology/objects\"`);\n}\nfunction getTsCompilerOptions(packageType) {\n    const commonTsconfig = {\n        importHelpers: true,\n        declaration: true,\n        isolatedModules: true,\n        esModuleInterop: true,\n        forceConsistentCasingInFileNames: true,\n        strict: true,\n        skipLibCheck: true,\n    };\n    const compilerOptions = packageType === \"commonjs\"\n        ? {\n            ...commonTsconfig,\n            module: \"commonjs\",\n            target: \"es2018\",\n        }\n        : {\n            ...commonTsconfig,\n            module: \"NodeNext\",\n            target: \"ES2020\",\n        };\n    return compilerOptions;\n}\nexport function getExpectedDependencies({ osdkApiVersion, osdkClientVersion, }) {\n    return {\n        devDependencies: {\n            \"@osdk/api\": osdkApiVersion,\n        },\n        peerDependencies: {\n            \"@osdk/api\": osdkApiVersion,\n            \"@osdk/client\": osdkClientVersion,\n        },\n    };\n}\nfunction getExpectedDependenciesFull(dependencyVersions) {\n    const { typescriptVersion, tslibVersion, areTheTypesWrongVersion, } = dependencyVersions;\n    const base = getExpectedDependencies(dependencyVersions);\n    return {\n        devDependencies: {\n            ...base.devDependencies,\n            \"typescript\": typescriptVersion,\n            \"tslib\": tslibVersion,\n            \"@arethetypeswrong/cli\": areTheTypesWrongVersion,\n        },\n        peerDependencies: {\n            ...base.peerDependencies,\n        },\n    };\n}\nexport function getPackageJsonContents(name, version, dependencyVersions) {\n    const esmPrefix = \"./dist/module\";\n    const commonjsPrefix = \"./dist/commonjs\";\n    return {\n        name,\n        version,\n        main: `${commonjsPrefix}/index.js`,\n        module: `${esmPrefix}/index.js`,\n        exports: {\n            \".\": {\n                import: `${esmPrefix}/index.js`,\n                require: `${commonjsPrefix}/index.js`,\n            },\n        },\n        scripts: {\n            prepack: `tsc -p ${esmPrefix}/tsconfig.json && tsc -p ${commonjsPrefix}/tsconfig.json`,\n            check: \"npm exec attw $(npm pack)\",\n        },\n        ...getExpectedDependenciesFull(dependencyVersions),\n        files: [\n            \"**/*.js\",\n            \"**/*.d.ts\",\n            \"dist/**/package.json\",\n        ],\n    };\n}\nasync function writeJson(minimalFs, filePath, body) {\n    // consola.info(`Writing ${filePath}`);\n    // consola.debug(`Writing ${filePath} with body`, body);\n    return await minimalFs.writeFile(filePath, JSON.stringify(body, undefined, 2) + \"\\n\");\n}\n"],"mappings":"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","ignoreList":[]}

package/build/browser/v2.0/UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst.js

@@ -17,7 +17,7 @@ import { __UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition } from "@osdk/gener
 import fastDeepEqual from "fast-deep-equal";
 import invariant from "tiny-invariant";
 import { extractNamespace } from "../GenerateContext/EnhancedBase.js";
-import { propertyJsdoc } from "../shared/propertyJsdoc.js";
+import { EnhancedInterfaceType } from "../GenerateContext/EnhancedInterfaceType.js";
 import { deleteUndefineds } from "../util/deleteUndefineds.js";
 import { stringify } from "../util/stringify.js";
 import { createDefinition, createObjectSet, createOsdkObject, createPropertyKeys, createProps } from "./wireObjectTypeV2ToSdkObjectConstV2.js";
@@ -26,14 +26,21 @@ export function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ont
   const definition = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(interfaceDef.raw, v2));
   const objectDefIdentifier = interfaceDef.getDefinitionIdentifier(v2);
   const parents = definition.implements?.map(p => {
-    !(ontology.interfaceTypes[p] != null) ? invariant(false, `Expected to find a parent interface named ${p} in the ontology and did not.`) : void 0;
-    const it = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(ontology.requireInterfaceType(p, true).raw, v2));
-    return it;
+    const parent = ontology.requireInterfaceType(p, true);
+    if (parent instanceof EnhancedInterfaceType) {
+      const it = deleteUndefineds(__UNSTABLE_wireInterfaceTypeV2ToSdkObjectDefinition(parent.raw, v2));
+      return it;
+    }
   }) ?? [];
   const mergedProperties = {
     ...definition.properties
   };
   for (const parent of parents) {
+    if (parent == null) {
+      // came from a foreign type and we cannot merge properties yet
+      // so if they weren't listed on the interface its over
+      continue;
+    }
     for (const apiName of Object.keys(parent.properties)) {
       if (definition.properties[apiName] != null) {
         !fastDeepEqual(definition.properties[apiName], parent.properties[apiName]) ? invariant(false, `Interface ${definition.apiName} redefines property '${apiName}' from parent '${parent.apiName}' but the properties do not match`) : void 0;
@@ -43,7 +50,6 @@ export function __UNSTABLE_wireInterfaceTypeV2ToSdkObjectConst(interfaceDef, ont
       mergedProperties[apiName] = parent.properties[apiName];
     }
   }
-  const ogProperties = definition.properties;
   definition.properties = mergedProperties;
   const objectSetIdentifier = `${interfaceDef.shortApiName}.ObjectSet`;
   const propertyKeysIdentifier = `${interfaceDef.shortApiName}.PropertyKeys`;
@@ -103,7 +109,7 @@ ${stringify(definition.links, {
 
       ${createObjectSet(interfaceDef, ids)}
 
-      ${createOsdkObject(interfaceDef, "OsdkObject", ids)}
+      ${createOsdkObject(interfaceDef, "OsdkInstance", ids)}
       
     }