Skip to content

TypeSchema/TS: drop isWithMetaField; inline isResourceIdentifier(base) #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ryukzak wants to merge 1 commit into from
Closed

TypeSchema/TS: drop isWithMetaField; inline isResourceIdentifier(base) #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/guides/typeschema-index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,6 @@ Work with FHIR profiles and their constraints:
```typescript
flatProfile(schema: ProfileTypeSchema): ProfileTypeSchema
Flattens a profile by resolving all differential constraints into a complete snapshot

isWithMetaField(profile: ProfileTypeSchema): boolean
Checks if a profile includes the meta field
```

---
Expand Down Expand Up @@ -172,7 +169,6 @@ const specializedId = tsIndex.findLastSpecializationByIdentifier(patientIdentifi

```typescript
const flatProfile = tsIndex.flatProfile(useCorePatientProfile);
const hasMeta = tsIndex.isWithMetaField(profile);
```

### Debug Utilities
Expand Down
20 changes: 7 additions & 13 deletions src/api/writer-generator/typescript/profile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,12 @@ export const generateProfileIndexFile = (

const generateProfileHelpersImport = (
w: TypeScript,
tsIndex: TypeSchemaIndex,
flatProfile: ProfileTypeSchema,
sliceDefs: SliceDef[],
factoryInfo: ProfileFactoryInfo,
) => {
const extensions = flatProfile.extensions ?? [];
const hasMeta = tsIndex.isWithMetaField(flatProfile);
const hasMeta = isResourceIdentifier(flatProfile.base);
const canonicalUrl = flatProfile.identifier.url;

const imports: string[] = [];
Expand Down Expand Up @@ -356,15 +355,10 @@ const generateStaticSliceFields = (w: TypeScript, sliceDefs: SliceDef[]) => {
if (sliceDefs.length > 0) w.line();
};

const generateFactoryMethods = (
w: TypeScript,
tsIndex: TypeSchemaIndex,
flatProfile: ProfileTypeSchema,
factoryInfo: ProfileFactoryInfo,
) => {
const generateFactoryMethods = (w: TypeScript, flatProfile: ProfileTypeSchema, factoryInfo: ProfileFactoryInfo) => {
const profileClassName = tsProfileClassName(flatProfile);
const tsBaseResourceName = tsTypeFromIdentifier(flatProfile.base);
const hasMeta = tsIndex.isWithMetaField(flatProfile);
const hasMeta = isResourceIdentifier(flatProfile.base);
const hasParams = factoryInfo.params.length > 0 || factoryInfo.sliceAutoFields.length > 0;
const createArgsTypeName = `${profileClassName}Raw`;
const paramSignature = hasParams ? `args: ${createArgsTypeName}` : "";
Expand All @@ -391,11 +385,11 @@ const generateFactoryMethods = (
w.lineSM("return profile");
});
w.line();
const canEmitIs = (hasMeta && isResourceIdentifier(flatProfile.base)) || flatProfile.base.name === "Extension";
const canEmitIs = hasMeta || flatProfile.base.name === "Extension";
if (canEmitIs) {
w.curlyBlock(["static", "is", "(resource: unknown)", `: resource is ${tsBaseResourceName}`], () => {
w.line(`if (typeof resource !== "object" || resource === null) return false;`);
if (hasMeta && isResourceIdentifier(flatProfile.base)) {
if (hasMeta) {
w.line(`const r = resource as { resourceType?: string; meta?: { profile?: string[] } };`);
w.line(`if (r.resourceType !== ${JSON.stringify(flatProfile.base.name)}) return false;`);
w.lineSM(`return (r.meta?.profile ?? []).includes(${profileClassName}.canonicalUrl)`);
Expand Down Expand Up @@ -754,7 +748,7 @@ export const generateProfileClass = (w: TypeScript, tsIndex: TypeSchemaIndex, fl
generateInlineExtensionInputTypes(w, tsIndex, flatProfile);
generateSliceInputTypes(w, flatProfile, sliceDefs);

generateProfileHelpersImport(w, tsIndex, flatProfile, sliceDefs, factoryInfo);
generateProfileHelpersImport(w, flatProfile, sliceDefs, factoryInfo);

generateRawType(w, flatProfile, factoryInfo);
generateFlatInputType(w, flatProfile);
Expand All @@ -768,7 +762,7 @@ export const generateProfileClass = (w: TypeScript, tsIndex: TypeSchemaIndex, fl
generateStaticSliceFields(w, sliceDefs);
w.lineSM(`private resource: ${tsBaseResourceName}`);
w.line();
generateFactoryMethods(w, tsIndex, flatProfile, factoryInfo);
generateFactoryMethods(w, flatProfile, factoryInfo);
generateFieldAccessors(w, factoryInfo);

w.line("// Extensions");
Expand Down
10 changes: 0 additions & 10 deletions src/typeschema/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ export type TypeSchemaIndex = {
baseTypeId: TypeIdentifier,
sliceElements: string[],
) => ConstrainedChoiceInfo | undefined;
isWithMetaField: (profile: ProfileTypeSchema) => boolean;
entityTree: () => EntityTree;
exportTree: (filename: string) => Promise<void>;
irReport: () => IrReport;
Expand Down Expand Up @@ -573,14 +572,6 @@ export const mkTypeSchemaIndex = (
return undefined;
};

const isWithMetaField = (profile: ProfileTypeSchema): boolean => {
const genealogy = tryHierarchy(profile);
if (!genealogy) return false;
return genealogy.filter(isSpecializationTypeSchema).some((schema) => {
return schema.fields?.meta !== undefined;
});
};

const entityTree = () => {
const tree: EntityTree = {};
for (const [pkgId, shemas] of Object.entries(groupByPackages(schemas))) {
Expand Down Expand Up @@ -626,7 +617,6 @@ export const mkTypeSchemaIndex = (
findLastSpecializationByIdentifier,
flatProfile,
constrainedChoice,
isWithMetaField,
entityTree,
exportTree,
irReport: () => irReport,
Expand Down
Loading