industrial-model 0.11.2 → 0.12.0

package/dist/cli/index.cjs

@@ -6,12 +6,12 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  try {
+    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  } catch (e) {
+    throw mod = 0, e;
+  }
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -29,12 +29,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
-var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 
 // node_modules/commander/lib/error.js
 var require_error = __commonJS({
@@ -3517,12 +3511,10 @@ var require_lib = __commonJS({
   "node_modules/mute-stream/lib/index.js"(exports2, module2) {
     "use strict";
     var Stream = require("stream");
-    var _isTTY, _MuteStream_instances, destSrc_fn, proxy_fn;
     var MuteStream2 = class extends Stream {
+      #isTTY = null;
       constructor(opts = {}) {
         super(opts);
-        __privateAdd(this, _MuteStream_instances);
-        __privateAdd(this, _isTTY, null);
         this.writable = this.readable = true;
         this.muted = false;
         this.on("pipe", this._onpipe);
@@ -3530,21 +3522,38 @@ var require_lib = __commonJS({
         this._prompt = opts.prompt || null;
         this._hadControl = false;
       }
+      #destSrc(key, def) {
+        if (this._dest) {
+          return this._dest[key];
+        }
+        if (this._src) {
+          return this._src[key];
+        }
+        return def;
+      }
+      #proxy(method, ...args) {
+        if (typeof this._dest?.[method] === "function") {
+          this._dest[method](...args);
+        }
+        if (typeof this._src?.[method] === "function") {
+          this._src[method](...args);
+        }
+      }
       get isTTY() {
-        if (__privateGet(this, _isTTY) !== null) {
-          return __privateGet(this, _isTTY);
+        if (this.#isTTY !== null) {
+          return this.#isTTY;
         }
-        return __privateMethod(this, _MuteStream_instances, destSrc_fn).call(this, "isTTY", false);
+        return this.#destSrc("isTTY", false);
       }
       // basically just get replace the getter/setter with a regular value
       set isTTY(val) {
-        __privateSet(this, _isTTY, val);
+        this.#isTTY = val;
       }
       get rows() {
-        return __privateMethod(this, _MuteStream_instances, destSrc_fn).call(this, "rows");
+        return this.#destSrc("rows");
       }
       get columns() {
-        return __privateMethod(this, _MuteStream_instances, destSrc_fn).call(this, "columns");
+        return this.#destSrc("columns");
       }
       mute() {
         this.muted = true;
@@ -3607,32 +3616,13 @@ var require_lib = __commonJS({
         this.emit("end");
       }
       destroy(...args) {
-        return __privateMethod(this, _MuteStream_instances, proxy_fn).call(this, "destroy", ...args);
+        return this.#proxy("destroy", ...args);
       }
       destroySoon(...args) {
-        return __privateMethod(this, _MuteStream_instances, proxy_fn).call(this, "destroySoon", ...args);
+        return this.#proxy("destroySoon", ...args);
       }
       close(...args) {
-        return __privateMethod(this, _MuteStream_instances, proxy_fn).call(this, "close", ...args);
-      }
-    };
-    _isTTY = new WeakMap();
-    _MuteStream_instances = new WeakSet();
-    destSrc_fn = function(key, def) {
-      if (this._dest) {
-        return this._dest[key];
-      }
-      if (this._src) {
-        return this._src[key];
-      }
-      return def;
-    };
-    proxy_fn = function(method, ...args) {
-      if (typeof this._dest?.[method] === "function") {
-        this._dest[method](...args);
-      }
-      if (typeof this._src?.[method] === "function") {
-        this._src[method](...args);
+        return this.#proxy("close", ...args);
       }
     };
     module2.exports = MuteStream2;
@@ -214422,37 +214412,25 @@ var isEnterKey = (key) => key.name === "enter" || key.name === "return";
 
 // node_modules/@inquirer/core/dist/lib/errors.js
 var AbortPromptError = class extends Error {
+  name = "AbortPromptError";
+  message = "Prompt was aborted";
   constructor(options) {
     super();
-    __publicField(this, "name", "AbortPromptError");
-    __publicField(this, "message", "Prompt was aborted");
     this.cause = options?.cause;
   }
 };
 var CancelPromptError = class extends Error {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "name", "CancelPromptError");
-    __publicField(this, "message", "Prompt was canceled");
-  }
+  name = "CancelPromptError";
+  message = "Prompt was canceled";
 };
 var ExitPromptError = class extends Error {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "name", "ExitPromptError");
-  }
+  name = "ExitPromptError";
 };
 var HookError = class extends Error {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "name", "HookError");
-  }
+  name = "HookError";
 };
 var ValidationError = class extends Error {
-  constructor() {
-    super(...arguments);
-    __publicField(this, "name", "ValidationError");
-  }
+  name = "ValidationError";
 };
 
 // node_modules/@inquirer/core/dist/lib/use-state.js
@@ -215481,17 +215459,17 @@ var kExitEmitter = /* @__PURE__ */ Symbol.for("signal-exit emitter");
 var global2 = globalThis;
 var ObjectDefineProperty = Object.defineProperty.bind(Object);
 var Emitter = class {
+  emitted = {
+    afterExit: false,
+    exit: false
+  };
+  listeners = {
+    afterExit: [],
+    exit: []
+  };
+  count = 0;
+  id = Math.random();
   constructor() {
-    __publicField(this, "emitted", {
-      afterExit: false,
-      exit: false
-    });
-    __publicField(this, "listeners", {
-      afterExit: [],
-      exit: []
-    });
-    __publicField(this, "count", 0);
-    __publicField(this, "id", Math.random());
     if (global2[kExitEmitter]) {
       return global2[kExitEmitter];
     }
@@ -215557,129 +215535,119 @@ var SignalExitFallback = class extends SignalExitBase {
   unload() {
   }
 };
-var _hupSig, _emitter, _process, _originalProcessEmit, _originalProcessReallyExit, _sigListeners, _loaded, _SignalExit_instances, processReallyExit_fn, processEmit_fn;
 var SignalExit = class extends SignalExitBase {
+  // "SIGHUP" throws an `ENOSYS` error on Windows,
+  // so use a supported signal instead
+  /* c8 ignore start */
+  #hupSig = process3.platform === "win32" ? "SIGINT" : "SIGHUP";
+  /* c8 ignore stop */
+  #emitter = new Emitter();
+  #process;
+  #originalProcessEmit;
+  #originalProcessReallyExit;
+  #sigListeners = {};
+  #loaded = false;
   constructor(process4) {
     super();
-    __privateAdd(this, _SignalExit_instances);
-    // "SIGHUP" throws an `ENOSYS` error on Windows,
-    // so use a supported signal instead
-    /* c8 ignore start */
-    __privateAdd(this, _hupSig, process3.platform === "win32" ? "SIGINT" : "SIGHUP");
-    /* c8 ignore stop */
-    __privateAdd(this, _emitter, new Emitter());
-    __privateAdd(this, _process);
-    __privateAdd(this, _originalProcessEmit);
-    __privateAdd(this, _originalProcessReallyExit);
-    __privateAdd(this, _sigListeners, {});
-    __privateAdd(this, _loaded, false);
-    __privateSet(this, _process, process4);
-    __privateSet(this, _sigListeners, {});
+    this.#process = process4;
+    this.#sigListeners = {};
     for (const sig of signals) {
-      __privateGet(this, _sigListeners)[sig] = () => {
-        const listeners = __privateGet(this, _process).listeners(sig);
-        let { count } = __privateGet(this, _emitter);
+      this.#sigListeners[sig] = () => {
+        const listeners = this.#process.listeners(sig);
+        let { count } = this.#emitter;
         const p = process4;
         if (typeof p.__signal_exit_emitter__ === "object" && typeof p.__signal_exit_emitter__.count === "number") {
           count += p.__signal_exit_emitter__.count;
         }
         if (listeners.length === count) {
           this.unload();
-          const ret = __privateGet(this, _emitter).emit("exit", null, sig);
-          const s = sig === "SIGHUP" ? __privateGet(this, _hupSig) : sig;
+          const ret = this.#emitter.emit("exit", null, sig);
+          const s = sig === "SIGHUP" ? this.#hupSig : sig;
           if (!ret)
             process4.kill(process4.pid, s);
         }
       };
     }
-    __privateSet(this, _originalProcessReallyExit, process4.reallyExit);
-    __privateSet(this, _originalProcessEmit, process4.emit);
+    this.#originalProcessReallyExit = process4.reallyExit;
+    this.#originalProcessEmit = process4.emit;
   }
   onExit(cb, opts) {
-    if (!processOk(__privateGet(this, _process))) {
+    if (!processOk(this.#process)) {
       return () => {
       };
     }
-    if (__privateGet(this, _loaded) === false) {
+    if (this.#loaded === false) {
       this.load();
     }
     const ev = opts?.alwaysLast ? "afterExit" : "exit";
-    __privateGet(this, _emitter).on(ev, cb);
+    this.#emitter.on(ev, cb);
     return () => {
-      __privateGet(this, _emitter).removeListener(ev, cb);
-      if (__privateGet(this, _emitter).listeners["exit"].length === 0 && __privateGet(this, _emitter).listeners["afterExit"].length === 0) {
+      this.#emitter.removeListener(ev, cb);
+      if (this.#emitter.listeners["exit"].length === 0 && this.#emitter.listeners["afterExit"].length === 0) {
         this.unload();
       }
     };
   }
   load() {
-    if (__privateGet(this, _loaded)) {
+    if (this.#loaded) {
       return;
     }
-    __privateSet(this, _loaded, true);
-    __privateGet(this, _emitter).count += 1;
+    this.#loaded = true;
+    this.#emitter.count += 1;
     for (const sig of signals) {
       try {
-        const fn = __privateGet(this, _sigListeners)[sig];
+        const fn = this.#sigListeners[sig];
         if (fn)
-          __privateGet(this, _process).on(sig, fn);
+          this.#process.on(sig, fn);
       } catch (_) {
       }
     }
-    __privateGet(this, _process).emit = (ev, ...a) => {
-      return __privateMethod(this, _SignalExit_instances, processEmit_fn).call(this, ev, ...a);
+    this.#process.emit = (ev, ...a) => {
+      return this.#processEmit(ev, ...a);
     };
-    __privateGet(this, _process).reallyExit = (code) => {
-      return __privateMethod(this, _SignalExit_instances, processReallyExit_fn).call(this, code);
+    this.#process.reallyExit = (code) => {
+      return this.#processReallyExit(code);
     };
   }
   unload() {
-    if (!__privateGet(this, _loaded)) {
+    if (!this.#loaded) {
       return;
     }
-    __privateSet(this, _loaded, false);
+    this.#loaded = false;
     signals.forEach((sig) => {
-      const listener = __privateGet(this, _sigListeners)[sig];
+      const listener = this.#sigListeners[sig];
       if (!listener) {
         throw new Error("Listener not defined for signal: " + sig);
       }
       try {
-        __privateGet(this, _process).removeListener(sig, listener);
+        this.#process.removeListener(sig, listener);
       } catch (_) {
       }
     });
-    __privateGet(this, _process).emit = __privateGet(this, _originalProcessEmit);
-    __privateGet(this, _process).reallyExit = __privateGet(this, _originalProcessReallyExit);
-    __privateGet(this, _emitter).count -= 1;
+    this.#process.emit = this.#originalProcessEmit;
+    this.#process.reallyExit = this.#originalProcessReallyExit;
+    this.#emitter.count -= 1;
   }
-};
-_hupSig = new WeakMap();
-_emitter = new WeakMap();
-_process = new WeakMap();
-_originalProcessEmit = new WeakMap();
-_originalProcessReallyExit = new WeakMap();
-_sigListeners = new WeakMap();
-_loaded = new WeakMap();
-_SignalExit_instances = new WeakSet();
-processReallyExit_fn = function(code) {
-  if (!processOk(__privateGet(this, _process))) {
-    return 0;
+  #processReallyExit(code) {
+    if (!processOk(this.#process)) {
+      return 0;
+    }
+    this.#process.exitCode = code || 0;
+    this.#emitter.emit("exit", this.#process.exitCode, null);
+    return this.#originalProcessReallyExit.call(this.#process, this.#process.exitCode);
   }
-  __privateGet(this, _process).exitCode = code || 0;
-  __privateGet(this, _emitter).emit("exit", __privateGet(this, _process).exitCode, null);
-  return __privateGet(this, _originalProcessReallyExit).call(__privateGet(this, _process), __privateGet(this, _process).exitCode);
-};
-processEmit_fn = function(ev, ...args) {
-  const og = __privateGet(this, _originalProcessEmit);
-  if (ev === "exit" && processOk(__privateGet(this, _process))) {
-    if (typeof args[0] === "number") {
-      __privateGet(this, _process).exitCode = args[0];
+  #processEmit(ev, ...args) {
+    const og = this.#originalProcessEmit;
+    if (ev === "exit" && processOk(this.#process)) {
+      if (typeof args[0] === "number") {
+        this.#process.exitCode = args[0];
+      }
+      const ret = og.call(this.#process, ev, ...args);
+      this.#emitter.emit("exit", this.#process.exitCode, null);
+      return ret;
+    } else {
+      return og.call(this.#process, ev, ...args);
     }
-    const ret = og.call(__privateGet(this, _process), ev, ...args);
-    __privateGet(this, _emitter).emit("exit", __privateGet(this, _process).exitCode, null);
-    return ret;
-  } else {
-    return og.call(__privateGet(this, _process), ev, ...args);
   }
 };
 var process3 = globalThis.process;
@@ -215735,12 +215703,12 @@ var eraseLines = (lines) => lines > 0 ? (eraseLine + cursorUp(1)).repeat(lines -
 var height = (content) => content.split("\n").length;
 var lastLine = (content) => content.split("\n").pop() ?? "";
 var ScreenManager = class {
+  // These variables are keeping information to allow correct prompt re-rendering
+  height = 0;
+  extraLinesUnderPrompt = 0;
+  cursorPos;
+  rl;
   constructor(rl) {
-    // These variables are keeping information to allow correct prompt re-rendering
-    __publicField(this, "height", 0);
-    __publicField(this, "extraLinesUnderPrompt", 0);
-    __publicField(this, "cursorPos");
-    __publicField(this, "rl");
     this.rl = rl;
     this.cursorPos = rl.getCursorPos();
   }
@@ -215922,9 +215890,9 @@ function createPrompt(view) {
 // node_modules/@inquirer/core/dist/lib/Separator.js
 var import_node_util3 = require("util");
 var Separator = class {
+  separator = (0, import_node_util3.styleText)("dim", Array.from({ length: 15 }).join(dist_default.line));
+  type = "separator";
   constructor(separator) {
-    __publicField(this, "separator", (0, import_node_util3.styleText)("dim", Array.from({ length: 15 }).join(dist_default.line)));
-    __publicField(this, "type", "separator");
     if (separator) {
       this.separator = separator;
     }
@@ -216425,6 +216393,7 @@ var CogniteSdkAdapter = class {
   constructor(client) {
     this.client = client;
   }
+  client;
   async retrieveDataModels(ids, options) {
     const response = await this.client.dataModels.retrieve(ids, options);
     return {
@@ -216434,6 +216403,11 @@ var CogniteSdkAdapter = class {
       }))
     };
   }
+  async retrieveViews(ids) {
+    const cleanIds = ids.map(({ space, externalId, version }) => ({ space, externalId, version }));
+    const response = await this.client.views.retrieve(cleanIds);
+    return { items: response.items };
+  }
   async queryInstances(request) {
     const response = await this.client.instances.query(
       request
@@ -216552,13 +216526,31 @@ function mapDatapointResult(item) {
   };
 }
 
+// src/utils/view.ts
+function isViewPropertyDefinition(p) {
+  return "container" in p;
+}
+function isReverseDirectRelation(p) {
+  return "through" in p;
+}
+function isEdgeConnection(p) {
+  return !isViewPropertyDefinition(p) && !isReverseDirectRelation(p) && "source" in p;
+}
+function getDirectRelationSource(p) {
+  const type = p.type;
+  if (type.type === "direct" && type.source) return type.source;
+  return void 0;
+}
+
 // src/mappers/view-mapper.ts
 var ViewMapper = class {
   constructor(cognite, dataModelId) {
     this.cognite = cognite;
     this.dataModelId = dataModelId;
-    this.cachePromise = null;
   }
+  cognite;
+  dataModelId;
+  cachePromise = null;
   async getView(externalId) {
     const views = await this.loadViews();
     const view = views.get(externalId);
@@ -216598,9 +216590,44 @@ var ViewMapper = class {
     for (const view of dm.views ?? []) {
       views.set(view.externalId, view);
     }
+    await this.loadDependencyViews(views);
     return views;
   }
+  async loadDependencyViews(views) {
+    const pending = /* @__PURE__ */ new Map();
+    for (const view of views.values()) {
+      for (const property of Object.values(view.properties)) {
+        for (const ref of collectPropertyRefs(property)) {
+          if (!views.has(ref.externalId) && !pending.has(ref.externalId)) {
+            pending.set(ref.externalId, ref);
+          }
+        }
+      }
+    }
+    if (pending.size === 0) return;
+    const sizeBefore = views.size;
+    const fetched = await this.cognite.retrieveViews(Array.from(pending.values()));
+    for (const view of fetched.items) {
+      views.set(view.externalId, view);
+    }
+    if (views.size > sizeBefore) {
+      await this.loadDependencyViews(views);
+    }
+  }
 };
+function collectPropertyRefs(property) {
+  if (isViewPropertyDefinition(property)) {
+    const source = getDirectRelationSource(property);
+    return source ? [source] : [];
+  }
+  if (isReverseDirectRelation(property)) {
+    return [property.source, property.through.source];
+  }
+  if (isEdgeConnection(property)) {
+    return [property.source];
+  }
+  return [];
+}
 
 // src/cli/generator/json-types-parser.ts
 var fs = __toESM(require("fs"), 1);
@@ -216700,22 +216727,6 @@ function toCamel(str) {
   return pascal.charAt(0).toLowerCase() + pascal.slice(1);
 }
 
-// src/utils/view.ts
-function isViewPropertyDefinition(p) {
-  return "container" in p;
-}
-function isReverseDirectRelation(p) {
-  return "through" in p;
-}
-function isEdgeConnection(p) {
-  return !isViewPropertyDefinition(p) && !isReverseDirectRelation(p) && "source" in p;
-}
-function getDirectRelationSource(p) {
-  const type = p.type;
-  if (type.type === "direct" && type.source) return type.source;
-  return void 0;
-}
-
 // src/cli/generator/constants.ts
 var typeMappings = {
   text: "string",
@@ -216735,8 +216746,19 @@ var typeMappings = {
 };
 
 // src/cli/generator/parser.ts
-function parseViews(views) {
-  return views.sort((a, b) => a.externalId.localeCompare(b.externalId)).map(parseView);
+function parseViews(views, knownExternalIds) {
+  const available = knownExternalIds ?? new Set(views.map((v) => v.externalId));
+  const parsed = views.sort((a, b) => a.externalId.localeCompare(b.externalId)).map(parseView);
+  for (const view of parsed) {
+    for (const field of view.fields) {
+      if (field.relationTargetExternalId && !available.has(field.relationTargetExternalId)) {
+        field.relationTarget = null;
+        field.relationTargetSpace = null;
+        field.relationTargetExternalId = null;
+      }
+    }
+  }
+  return parsed;
 }
 function parseView(view) {
   const fields = [];
@@ -217503,7 +217525,7 @@ async function promptAuth(flags) {
   });
   const baseUrl = flags.baseUrl || await dist_default4({
     message: "CDF base URL:",
-    default: extracted.baseUrl || "https://az-eastus-1.cognitedata.com"
+    default: extracted.baseUrl || "https://az-phx-001.cognitedata.com"
   });
   return { token, project, baseUrl };
 }
@@ -217621,7 +217643,7 @@ var generateCommand = new Command("generate").description("Generate TypeScript t
     dataModelVersion: dataModel.version,
     clientName: options.clientName,
     outputPath: options.outputPath,
-    packageVersion: "0.11.2"
+    packageVersion: "0.12.0"
   });
   console.log(
     `
@@ -217662,7 +217684,7 @@ Error loading JSON types file: ${error instanceof Error ? error.message : error}
 });
 
 // src/cli/index.ts
-var program2 = new Command().name("industrial-model").description("Code generator for Cognite Data Fusion data models").version("0.11.2");
+var program2 = new Command().name("industrial-model").description("Code generator for Cognite Data Fusion data models").version("0.12.0");
 program2.addCommand(generateCommand);
 program2.parse();
 /*! Bundled license information: