@atomic-ehr/codegen 0.0.1-canary.20251010131311.9439f74 → 0.0.1-canary.20251010140912.b42d372

package/dist/index.js

@@ -4890,7 +4890,7 @@ ${nestedInterfaces}`;
     }
     const optional = required ? "" : "?";
     const arrayType = isArray ? "[]" : "";
-    return `${fieldName.replace("-", "_")}${optional}: ${typeString}${arrayType};`;
+    return `${fieldName}${optional}: ${typeString}${arrayType};`;
   }
   // ==========================================
   /**
@@ -5319,12 +5319,20 @@ var tsResourceName = (id) => {
   }
   return normalizeTsName(id.name);
 };
-var tsFieldName = (n) => normalizeTsName(n);
+var tsKeywords = /* @__PURE__ */ new Set(["class", "function", "return", "if", "for", "while", "const", "let", "var", "import", "export", "interface"]);
+var tsFieldName = (n) => {
+  if (tsKeywords.has(n)) return `"${n}"`;
+  if (n.includes(" ") || n.includes("-")) return `"${n}"`;
+  return n;
+};
 var normalizeTsName = (n) => {
-  const tsKeywords = /* @__PURE__ */ new Set(["abstract", "any", "as", "async", "await", "boolean", "bigint", "break", "case", "catch", "class", "const", "constructor", "continue", "debugger", "declare", "default", "delete", "do", "else", "enum", "export", "extends", "extern", "false", "finally", "for", "function", "from", "get", "goto", "if", "implements", "import", "in", "infer", "instanceof", "interface", "keyof", "let", "module", "namespace", "never", "new", "null", "number", "object", "of", "override", "private", "protected", "public", "readonly", "return", "satisfies", "set", "static", "string", "super", "switch", "this", "throw", "true", "try", "type", "typeof", "unknown", "var", "void", "while"]);
   if (tsKeywords.has(n)) n = `${n}_`;
   return n.replace(/[- ]/g, "_");
 };
+var tsGet = (object, tsFieldName2) => {
+  if (tsFieldName2.startsWith('"')) return `${object}[${tsFieldName2}]`;
+  return `${object}.${tsFieldName2}`;
+};
 var TypeScript = class extends Writer {
   tsImportType(tsPackageName, ...entities) {
     this.lineSM(`import type { ${entities.join(", ")} } from "${tsPackageName}"`);
@@ -5388,7 +5396,8 @@ var TypeScript = class extends Writer {
   }
   addFieldExtension(fieldName, field) {
     if (field.type.kind === "primitive-type") {
-      this.lineSM(`_${tsFieldName(fieldName)}?: Element`);
+      const extFieldName = tsFieldName(`_${fieldName}`);
+      this.lineSM(`${extFieldName}?: Element`);
     }
   }
   generateType(tsIndex, schema) {
@@ -5513,7 +5522,7 @@ var TypeScript = class extends Writer {
             this.line(`profile: ['${flatProfile.identifier.url}']`);
           }, [","]);
           profileFields.forEach((fieldName) => {
-            this.line(`${fieldName}:`, `profile.${fieldName},`);
+            this.line(`${fieldName}: ${tsGet("profile", fieldName)},`);
           });
         });
       }
@@ -5544,7 +5553,7 @@ var TypeScript = class extends Writer {
           if (!isNotChoiceDeclarationField(pField) || !isNotChoiceDeclarationField(rField)) return;
           if (pField.required && !rField.required) {
             this.curlyBlock(
-              [`if (resource.${tsField} === undefined)`],
+              [`if (${tsGet("resource", tsField)} === undefined)`],
               () => this.lineSM(
                 `throw new Error("'${tsField}' is required for ${flatProfile.identifier.url}")`
               )
@@ -5563,11 +5572,11 @@ var TypeScript = class extends Writer {
                 this.line(";");
               });
             });
-            let cond = !pField?.required ? `!resource.${tsField} || ` : "";
+            let cond = !pField?.required ? `!${tsGet("resource", tsField)} || ` : "";
             if (pField.array) {
-              cond += `resource.${tsField}.every( (ref) => ${predName}(ref) )`;
+              cond += `${tsGet("resource", tsField)}.every( (ref) => ${predName}(ref) )`;
             } else {
-              cond += `!${predName}(resource.${tsField})`;
+              cond += `!${predName}(${tsGet("resource", tsField)})`;
             }
             this.curlyBlock(["if (", cond, ")"], () => {
               this.lineSM(
@@ -5583,9 +5592,12 @@ var TypeScript = class extends Writer {
           profileFields.forEach((fieldName) => {
             const tsField = tsFieldName(fieldName);
             if (shouldCast[fieldName]) {
-              this.line(`${tsField}:`, `resource.${tsField} as ${tsProfileName}['${tsField}'],`);
+              this.line(
+                `${tsField}:`,
+                `${tsGet("resource", tsField)} as ${tsProfileName}['${tsField}'],`
+              );
             } else {
-              this.line(`${tsField}:`, `resource.${tsField},`);
+              this.line(`${tsField}:`, `${tsGet("resource", tsField)},`);
             }
           });
         });