industrial-model 0.11.0 → 0.11.2

package/dist/cli/index.cjs

@@ -216634,9 +216634,9 @@ function parseJsonTypesFile(filePath) {
     }
   }
   for (const override of overrides) {
-    if (!typeDeclarations.has(override.type)) {
+    if (!typeDeclarations.has(override.expectedType)) {
       throw new Error(
-        `JSON types config error: type "${override.type}" referenced by property "${override.space}/${override.view}/${override.property}" is not exported from ${filePath}`
+        `JSON types config error: type "${override.expectedType}" referenced by property "${override.viewSpace}/${override.viewExternalId}/${override.viewProperty}" is not exported from ${filePath}`
       );
     }
   }
@@ -216672,16 +216672,16 @@ function extractMappings(node, sourceFile) {
         obj[prop.name.text] = prop.initializer.text;
       }
     }
-    if (!obj.space || !obj.view || !obj.property || !obj.type) {
+    if (!obj.viewSpace || !obj.viewExternalId || !obj.viewProperty || !obj.expectedType) {
       throw new Error(
-        `JSON types config error: each entry must have "space", "view", "property", and "type" fields. Got: ${element.getText(sourceFile)}`
+        `JSON types config error: each entry must have "viewSpace", "viewExternalId", "viewProperty", and "expectedType" fields. Got: ${element.getText(sourceFile)}`
       );
     }
     results.push({
-      space: obj.space,
-      view: obj.view,
-      property: obj.property,
-      type: obj.type
+      viewSpace: obj.viewSpace,
+      viewExternalId: obj.viewExternalId,
+      viewProperty: obj.viewProperty,
+      expectedType: obj.expectedType
     });
   }
   return results;
@@ -216733,46 +216733,6 @@ 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) {
@@ -216781,10 +216741,7 @@ function parseViews(views) {
 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)) {
@@ -216821,8 +216778,7 @@ function processMappedProperty(propertyName, fieldName, prop) {
     originalName: propertyName,
     cogniteType,
     mappedType,
-    isNullable: true,
-    // Cognite SDK doesn't expose nullable in this type; default to true
+    isNullable: prop.nullable !== false,
     isList,
     isRelation,
     isEdge: false,
@@ -216890,7 +216846,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";
@@ -217167,25 +217123,25 @@ function generate(views, config, jsonTypesConfig) {
 function applyJsonTypeOverrides(views, jsonTypesConfig) {
   for (const override of jsonTypesConfig.overrides) {
     const view = views.find(
-      (v) => v.viewExternalId === override.view && v.viewSpace === override.space
+      (v) => v.viewExternalId === override.viewExternalId && v.viewSpace === override.viewSpace
     );
     if (!view) {
       throw new Error(
-        `JSON types config error: view "${override.space}/${override.view}" not found in data model`
+        `JSON types config error: view "${override.viewSpace}/${override.viewExternalId}" not found in data model`
       );
     }
-    const field = view.fields.find((f) => f.originalName === override.property);
+    const field = view.fields.find((f) => f.originalName === override.viewProperty);
     if (!field) {
       throw new Error(
-        `JSON types config error: property "${override.property}" not found in view "${override.space}/${override.view}"`
+        `JSON types config error: property "${override.viewProperty}" not found in view "${override.viewSpace}/${override.viewExternalId}"`
       );
     }
     if (field.cogniteType !== "json") {
       throw new Error(
-        `JSON types config error: property "${override.property}" in view "${override.space}/${override.view}" is of type "${field.cogniteType}", not "json"`
+        `JSON types config error: property "${override.viewProperty}" in view "${override.viewSpace}/${override.viewExternalId}" is of type "${field.cogniteType}", not "json"`
       );
     }
-    field.mappedType = override.type;
+    field.mappedType = override.expectedType;
   }
 }
 function generateFromDefinitions(viewDefinitions, config, jsonTypesConfig) {
@@ -217665,7 +217621,7 @@ var generateCommand = new Command("generate").description("Generate TypeScript t
     dataModelVersion: dataModel.version,
     clientName: options.clientName,
     outputPath: options.outputPath,
-    packageVersion: "0.11.0"
+    packageVersion: "0.11.2"
   });
   console.log(
     `
@@ -217706,7 +217662,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.0");
+var program2 = new Command().name("industrial-model").description("Code generator for Cognite Data Fusion data models").version("0.11.2");
 program2.addCommand(generateCommand);
 program2.parse();
 /*! Bundled license information: