Skip to content

Commit

Permalink
create basic elements for Miroir Action Script (MAS), migrate Tools.s…
Browse files Browse the repository at this point in the history 
…ubmit to MAS #28. refactor fetchQuery attribute to "extractors" in Reports, so that "pure" extraction and join extraction are handled separately. Migrated all reports to new format.
  • Loading branch information
@miroir-framework
miroir-framework committed Aug 5, 2024
1 parent 0f08404 commit 424a5f7
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 19 deletions.
6 changes: 6 additions & 0 deletions ...miroir-core/src/0_interfaces/1_core/preprocessor-generated/miroirFundamentalJzodSchema.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2801,6 +2801,7 @@ export const miroirFundamentalJzodSchema = {
},
"fetchQuery": {
"type": "schemaReference",
"optional": true,
"definition": {
"absolutePath": "fe9b7d99-f216-44de-bb6e-60e1a1ebb739",
"relativePath": "miroirSelectQueriesRecord"
Expand Down Expand Up @@ -3364,6 +3365,7 @@ export const miroirFundamentalJzodSchema = {
},
"fetchQuery": {
"type": "schemaReference",
"optional": true,
"definition": {
"absolutePath": "fe9b7d99-f216-44de-bb6e-60e1a1ebb739",
"relativePath": "miroirSelectQueriesRecord"
Expand Down Expand Up @@ -16222,10 +16224,12 @@ export const miroirFundamentalJzodSchema = {
]
},
"fetchQuery": {
"optional": true,
"type": "union",
"definition": [
{
"type": "schemaReference",
"optional": true,
"definition": {
"relativePath": "carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord"
},
Expand Down Expand Up @@ -17409,10 +17413,12 @@ export const miroirFundamentalJzodSchema = {
]
},
"fetchQuery": {
"optional": true,
"type": "union",
"definition": [
{
"type": "schemaReference",
"optional": true,
"definition": {
"absolutePath": "fe9b7d99-f216-44de-bb6e-60e1a1ebb739",
"relativePath": "miroirSelectQueriesRecord"
Expand Down
12 changes: 6 additions & 6 deletions packages/miroir-core/src/0_interfaces/1_core/preprocessor-generated/miroirFundamentalType.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ export type RootReportSection = {
extractors?: {
[x: string]: QuerySelectExtractor;
} | undefined;
fetchQuery: MiroirSelectQueriesRecord;
fetchQuery?: MiroirSelectQueriesRecord | undefined;
section: ReportSection;
};
export type JzodObjectOrReference = JzodReference | JzodObject;
Expand Down Expand Up @@ -717,7 +717,7 @@ export type Report = {
extractors?: {
[x: string]: QuerySelectExtractor;
} | undefined;
fetchQuery: MiroirSelectQueriesRecord;
fetchQuery?: MiroirSelectQueriesRecord | undefined;
section: ReportSection;
};
};
Expand Down Expand Up @@ -2200,7 +2200,7 @@ export type CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_rootReportSection = Car
extractors?: (({
[x: string]: CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_querySelectExtractor | CarryOnObject;
} | undefined) | CarryOnObject) | undefined;
fetchQuery: CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord | CarryOnObject;
fetchQuery?: ((CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord | undefined) | CarryOnObject) | undefined;
section: CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_reportSection | CarryOnObject;
};
export type CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_report = CarryOnObject | {
Expand Down Expand Up @@ -2773,10 +2773,10 @@ export const objectListReportSection: z.ZodType<ObjectListReportSection> = z.obj
export const gridReportSection: z.ZodType<GridReportSection> = z.object({type:z.literal("grid"), fetchQuery:z.lazy(() =>miroirSelectQueriesRecord).optional(), selectData:z.lazy(() =>miroirSelectQueriesRecord).optional(), definition:z.array(z.array(z.lazy(() =>reportSection)))}).strict();
export const listReportSection: z.ZodType<ListReportSection> = z.object({type:z.literal("list"), fetchQuery:z.lazy(() =>miroirSelectQueriesRecord).optional(), selectData:z.lazy(() =>miroirSelectQueriesRecord).optional(), definition:z.array(z.union([z.lazy(() =>objectInstanceReportSection), z.lazy(() =>objectListReportSection)]))}).strict();
export const reportSection: z.ZodType<ReportSection> = z.union([z.lazy(() =>gridReportSection), z.lazy(() =>listReportSection), z.lazy(() =>objectListReportSection), z.lazy(() =>objectInstanceReportSection)]);
export const rootReportSection: z.ZodType<RootReportSection> = z.object({reportParametersToFetchQueryParametersTransformer:z.record(z.string(),z.string()).optional(), reportParameters:z.record(z.string(),z.string()).optional(), extractors:z.record(z.string(),z.lazy(() =>querySelectExtractor)).optional(), fetchQuery:z.lazy(() =>miroirSelectQueriesRecord), section:z.lazy(() =>reportSection)}).strict();
export const rootReportSection: z.ZodType<RootReportSection> = z.object({reportParametersToFetchQueryParametersTransformer:z.record(z.string(),z.string()).optional(), reportParameters:z.record(z.string(),z.string()).optional(), extractors:z.record(z.string(),z.lazy(() =>querySelectExtractor)).optional(), fetchQuery:z.lazy(() =>miroirSelectQueriesRecord).optional(), section:z.lazy(() =>reportSection)}).strict();
export const jzodObjectOrReference: z.ZodType<JzodObjectOrReference> = z.union([z.lazy(() =>jzodReference), z.lazy(() =>jzodObject)]);
export const jzodSchema: z.ZodType<JzodSchema> = z.object({uuid:z.string().uuid(), parentName:z.string(), parentUuid:z.string().uuid(), parentDefinitionVersionUuid:z.string().uuid().optional(), name:z.string(), conceptLevel:z.enum(["MetaModel","Model","Data"]).optional(), defaultLabel:z.string().optional(), description:z.string().optional(), definition:z.lazy(() =>jzodObjectOrReference).optional()}).strict();
export const report: z.ZodType<Report> = z.object({uuid:z.string().uuid(), parentName:z.string().optional(), parentUuid:z.string().uuid(), parentDefinitionVersionUuid:z.string().uuid().optional(), conceptLevel:z.enum(["MetaModel","Model","Data"]).optional(), name:z.string(), defaultLabel:z.string(), type:z.enum(["list","grid"]).optional(), application:z.string().uuid().optional(), definition:z.object({reportParametersToFetchQueryParametersTransformer:z.record(z.string(),z.string()).optional(), reportParameters:z.record(z.string(),z.string()).optional(), extractors:z.record(z.string(),z.lazy(() =>querySelectExtractor)).optional(), fetchQuery:z.lazy(() =>miroirSelectQueriesRecord), section:z.lazy(() =>reportSection)}).strict()}).strict();
export const report: z.ZodType<Report> = z.object({uuid:z.string().uuid(), parentName:z.string().optional(), parentUuid:z.string().uuid(), parentDefinitionVersionUuid:z.string().uuid().optional(), conceptLevel:z.enum(["MetaModel","Model","Data"]).optional(), name:z.string(), defaultLabel:z.string(), type:z.enum(["list","grid"]).optional(), application:z.string().uuid().optional(), definition:z.object({reportParametersToFetchQueryParametersTransformer:z.record(z.string(),z.string()).optional(), reportParameters:z.record(z.string(),z.string()).optional(), extractors:z.record(z.string(),z.lazy(() =>querySelectExtractor)).optional(), fetchQuery:z.lazy(() =>miroirSelectQueriesRecord).optional(), section:z.lazy(() =>reportSection)}).strict()}).strict();
export const metaModel: z.ZodType<MetaModel> = z.object({applicationVersions:z.array(z.lazy(() =>applicationVersion)), applicationVersionCrossEntityDefinition:z.array(z.object({uuid:z.string().uuid(), parentName:z.string().optional(), parentUuid:z.string().uuid(), conceptLevel:z.enum(["MetaModel","Model","Data"]).optional(), applicationVersion:z.string().uuid(), entityDefinition:z.string().uuid()}).strict()), configuration:z.array(z.lazy(() =>storeBasedConfiguration)), entities:z.array(z.lazy(() =>entity)), entityDefinitions:z.array(z.lazy(() =>entityDefinition)), jzodSchemas:z.array(z.lazy(() =>jzodSchema)), menus:z.array(z.lazy(() =>menu)), reports:z.array(z.lazy(() =>report))}).strict();
export const _________________________________configuration_and_bundles_________________________________: z.ZodType<_________________________________configuration_and_bundles_________________________________> = z.never();
export const indexedDbStoreSectionConfiguration: z.ZodType<IndexedDbStoreSectionConfiguration> = z.object({emulatedServerType:z.literal("indexedDb"), indexedDbName:z.string()}).strict();
Expand Down Expand Up @@ -2946,7 +2946,7 @@ export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_objectListReportSectio
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_gridReportSection: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_gridReportSection> = z.union([z.lazy(() =>carryOnObject), z.object({type:z.union([z.literal("grid"), z.lazy(() =>carryOnObject)]), fetchQuery:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord).optional(), z.lazy(() =>carryOnObject)]).optional(), selectData:z.union([z.lazy(() =>miroirSelectQueriesRecord).optional(), z.lazy(() =>carryOnObject)]).optional(), definition:z.union([z.array(z.union([z.array(z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_reportSection), z.lazy(() =>carryOnObject)])), z.lazy(() =>carryOnObject)])), z.lazy(() =>carryOnObject)])}).strict()]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_listReportSection: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_listReportSection> = z.union([z.lazy(() =>carryOnObject), z.object({type:z.union([z.literal("list"), z.lazy(() =>carryOnObject)]), fetchQuery:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord).optional(), z.lazy(() =>carryOnObject)]).optional(), selectData:z.union([z.lazy(() =>miroirSelectQueriesRecord).optional(), z.lazy(() =>carryOnObject)]).optional(), definition:z.union([z.array(z.union([z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_objectInstanceReportSection), z.lazy(() =>carryOnObject)]), z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_objectListReportSection), z.lazy(() =>carryOnObject)]), z.lazy(() =>carryOnObject)])), z.lazy(() =>carryOnObject)])}).strict()]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_reportSection: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_reportSection> = z.union([z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_gridReportSection), z.lazy(() =>carryOnObject)]), z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_listReportSection), z.lazy(() =>carryOnObject)]), z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_objectListReportSection), z.lazy(() =>carryOnObject)]), z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_objectInstanceReportSection), z.lazy(() =>carryOnObject)]), z.lazy(() =>carryOnObject)]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_rootReportSection: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_rootReportSection> = z.union([z.lazy(() =>carryOnObject), z.object({reportParametersToFetchQueryParametersTransformer:z.union([z.record(z.string(),z.union([z.string(), z.lazy(() =>carryOnObject)])).optional(), z.lazy(() =>carryOnObject)]).optional(), reportParameters:z.union([z.record(z.string(),z.union([z.string(), z.lazy(() =>carryOnObject)])).optional(), z.lazy(() =>carryOnObject)]).optional(), extractors:z.union([z.record(z.string(),z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_querySelectExtractor), z.lazy(() =>carryOnObject)])).optional(), z.lazy(() =>carryOnObject)]).optional(), fetchQuery:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord), z.lazy(() =>carryOnObject)]), section:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_reportSection), z.lazy(() =>carryOnObject)])}).strict()]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_rootReportSection: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_rootReportSection> = z.union([z.lazy(() =>carryOnObject), z.object({reportParametersToFetchQueryParametersTransformer:z.union([z.record(z.string(),z.union([z.string(), z.lazy(() =>carryOnObject)])).optional(), z.lazy(() =>carryOnObject)]).optional(), reportParameters:z.union([z.record(z.string(),z.union([z.string(), z.lazy(() =>carryOnObject)])).optional(), z.lazy(() =>carryOnObject)]).optional(), extractors:z.union([z.record(z.string(),z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_querySelectExtractor), z.lazy(() =>carryOnObject)])).optional(), z.lazy(() =>carryOnObject)]).optional(), fetchQuery:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_miroirSelectQueriesRecord).optional(), z.lazy(() =>carryOnObject)]).optional(), section:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_reportSection), z.lazy(() =>carryOnObject)])}).strict()]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_report: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_report> = z.union([z.lazy(() =>carryOnObject), z.object({uuid:z.union([z.string().uuid(), z.lazy(() =>carryOnObject)]), parentName:z.union([z.string().optional(), z.lazy(() =>carryOnObject)]).optional(), parentUuid:z.union([z.string().uuid(), z.lazy(() =>carryOnObject)]), parentDefinitionVersionUuid:z.union([z.string().uuid().optional(), z.lazy(() =>carryOnObject)]).optional(), conceptLevel:z.union([z.enum(["MetaModel","Model","Data"]).optional(), z.lazy(() =>carryOnObject)]).optional(), name:z.union([z.string(), z.lazy(() =>carryOnObject)]), defaultLabel:z.union([z.string(), z.lazy(() =>carryOnObject)]), type:z.union([z.enum(["list","grid"]).optional(), z.lazy(() =>carryOnObject)]).optional(), application:z.union([z.string().uuid().optional(), z.lazy(() =>carryOnObject)]).optional(), definition:z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_rootReportSection), z.lazy(() =>carryOnObject)])}).strict()]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_transformer: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_transformer> = z.union([z.object({transformerType:z.union([z.literal("objectTransformer"), z.lazy(() =>carryOnObject)]), attributeName:z.union([z.string(), z.lazy(() =>carryOnObject)])}).strict(), z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_recordOfTransformers), z.lazy(() =>carryOnObject)]), z.lazy(() =>carryOnObject)]);
export const carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_recordOfTransformers: z.ZodType<CarryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_recordOfTransformers> = z.union([z.lazy(() =>carryOnObject), z.object({transformerType:z.union([z.literal("recordOfTransformers"), z.lazy(() =>carryOnObject)]), definition:z.union([z.record(z.string(),z.union([z.lazy(() =>carryOn_fe9b7d99$f216$44de$bb6e$60e1a1ebb739_transformer), z.lazy(() =>carryOnObject)])), z.lazy(() =>carryOnObject)])}).strict()]);
Expand Down
2 changes: 0 additions & 2 deletions ...dmin_model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/08acd6c2-710a-4b17-a92a-60b81c936cfc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
}
}
},
"fetchQuery": {
},
"section": {
"type": "list",
"definition": [
Expand Down
2 changes: 0 additions & 2 deletions ...dmin_model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/2d690e4f-16f6-4332-be6c-45d5179b3981.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
}
}
},
"fetchQuery": {
},
"section": {
"type":"objectListReportSection",
"definition": {
Expand Down
2 changes: 0 additions & 2 deletions ...dmin_model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/e4488cba-b743-4b46-80e5-18c441c9882c.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
}
}
},
"fetchQuery": {
},
"section": {
"type":"objectListReportSection",
"definition": {
Expand Down
2 changes: 0 additions & 2 deletions ...dmin_model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/faaf8c68-020a-48b1-b439-abc196855295.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
}
}
},
"fetchQuery": {
},
"section": {
"type": "list",
"definition": [
Expand Down
2 changes: 0 additions & 2 deletions ...rary_model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/3df9413d-5050-4357-910c-f764aacae7e6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
}
}
},
"fetchQuery": {
},
"section": {
"type":"objectListReportSection",
"definition": {
Expand Down
2 changes: 0 additions & 2 deletions ...rary_model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/8adee3d5-f8cc-4118-aa02-5a2cd07908aa.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
}
}
},
"fetchQuery": {
},
"section": {
"type": "list",
"definition": [
Expand Down
2 changes: 1 addition & 1 deletion ...dmin/model/3f2baa83-3ef7-45ce-82ea-6a43f7a8c916/6d9faa54-643c-4aec-87c3-32635ad95902.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name":"DeploymentList",
"defaultLabel": "List of Deployments",
"definition": {
"fetchQuery": {
"extractors": {
"deployments": {
"queryType": "selectObjectByDirectReference",
"parentName": "Deployment",
Expand Down
1 change: 1 addition & 0 deletions ...roir_model/54b9c72f-d4f3-4db9-9e0e-0dc840b530bd/952d2c65-4da2-45c2-9394-a0920ceedfb6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@
},
"fetchQuery": {
"type": "schemaReference",
"optional":true,
"definition": {
"absolutePath": "fe9b7d99-f216-44de-bb6e-60e1a1ebb739",
"relativePath": "miroirSelectQueriesRecord"
Expand Down

0 comments on commit 424a5f7

Please sign in to comment.