industrial-model 0.11.1 → 0.11.3

package/dist/cli/index.cjs

@@ -216434,6 +216434,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,6 +216557,22 @@ 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) {
@@ -216598,9 +216619,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 +216756,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",
@@ -216733,58 +216773,26 @@ var typeMappings = {
   direct: "NodeId",
   enum: "string"
 };
-var reservedWords = /* @__PURE__ */ new Set([
-  "break",
-  "case",
-  "catch",
-  "class",
-  "const",
-  "continue",
-  "debugger",
-  "default",
-  "delete",
-  "do",
-  "else",
-  "enum",
-  "export",
-  "extends",
-  "false",
-  "finally",
-  "for",
-  "function",
-  "if",
-  "import",
-  "in",
-  "instanceof",
-  "new",
-  "null",
-  "return",
-  "super",
-  "switch",
-  "this",
-  "throw",
-  "true",
-  "try",
-  "typeof",
-  "undefined",
-  "var",
-  "void",
-  "while",
-  "with",
-  "yield"
-]);
 
 // 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 = [];
   for (const [propertyName, prop] of Object.entries(view.properties)) {
-    let fieldName = toCamel(propertyName);
-    if (reservedWords.has(fieldName)) {
-      fieldName = `${fieldName}_`;
-    }
+    const fieldName = toCamel(propertyName);
     if (isViewPropertyDefinition(prop)) {
       fields.push(processMappedProperty(propertyName, fieldName, prop));
     } else if (isEdgeConnection(prop)) {
@@ -216889,7 +216897,7 @@ function getInterfaceType(field, viewName) {
 }
 function getEnumTypeName(viewName, field) {
   const capitalized = field.fieldName.charAt(0).toUpperCase() + field.fieldName.slice(1);
-  return `${viewName}${capitalized}`;
+  return `${viewName}_${capitalized}`;
 }
 function getRelationResolvedType(field) {
   const target = field.relationTarget ?? "unknown";
@@ -217546,7 +217554,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 };
 }
@@ -217664,7 +217672,7 @@ var generateCommand = new Command("generate").description("Generate TypeScript t
     dataModelVersion: dataModel.version,
     clientName: options.clientName,
     outputPath: options.outputPath,
-    packageVersion: "0.11.1"
+    packageVersion: "0.11.3"
   });
   console.log(
     `
@@ -217705,7 +217713,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.1");
+var program2 = new Command().name("industrial-model").description("Code generator for Cognite Data Fusion data models").version("0.11.3");
 program2.addCommand(generateCommand);
 program2.parse();
 /*! Bundled license information: