@voxgig/apidef 8.13.0 → 8.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/dist/apidef.d.ts +2 -2
  2. package/dist/apidef.js +2 -2
  3. package/dist/apidef.js.map +1 -1
  4. package/dist/builder/entity/entity.d.ts +5 -1
  5. package/dist/builder/entity/entity.js +17 -1
  6. package/dist/builder/entity/entity.js.map +1 -1
  7. package/dist/builder/flow/flowHeuristic01.js +14 -14
  8. package/dist/builder/flow/flowHeuristic01.js.map +1 -1
  9. package/dist/model.d.ts +35 -33
  10. package/dist/resolved.d.ts +10 -6
  11. package/dist/resolved.js +65 -15
  12. package/dist/resolved.js.map +1 -1
  13. package/dist/transform/args.js +19 -19
  14. package/dist/transform/args.js.map +1 -1
  15. package/dist/transform/clean.js +4 -0
  16. package/dist/transform/clean.js.map +1 -1
  17. package/dist/transform/contract.d.ts +0 -2
  18. package/dist/transform/contract.js +6 -75
  19. package/dist/transform/contract.js.map +1 -1
  20. package/dist/transform/entity.d.ts +2 -1
  21. package/dist/transform/entity.js +13 -1
  22. package/dist/transform/entity.js.map +1 -1
  23. package/dist/transform/field.js +64 -64
  24. package/dist/transform/field.js.map +1 -1
  25. package/dist/transform/flowstep.js +42 -42
  26. package/dist/transform/flowstep.js.map +1 -1
  27. package/dist/transform/graphql.js +8 -8
  28. package/dist/transform/graphql.js.map +1 -1
  29. package/dist/transform/operation.js +9 -9
  30. package/dist/transform/operation.js.map +1 -1
  31. package/dist/transform/select.js +13 -13
  32. package/dist/transform/select.js.map +1 -1
  33. package/dist/tsconfig.tsbuildinfo +1 -1
  34. package/dist/types.d.ts +1 -1
  35. package/dist/utility.d.ts +2 -1
  36. package/dist/utility.js +5 -0
  37. package/dist/utility.js.map +1 -1
  38. package/model/apidef.aon +128 -157
  39. package/model/guide.aon +3 -2
  40. package/package.json +5 -3
  41. package/src/apidef.ts +4 -3
  42. package/src/builder/entity/entity.ts +18 -1
  43. package/src/builder/flow/flowHeuristic01.ts +14 -14
  44. package/src/model.ts +36 -37
  45. package/src/resolved.ts +62 -17
  46. package/src/transform/args.ts +20 -20
  47. package/src/transform/clean.ts +5 -0
  48. package/src/transform/contract.ts +6 -71
  49. package/src/transform/entity.ts +13 -1
  50. package/src/transform/field.ts +66 -69
  51. package/src/transform/flowstep.ts +42 -42
  52. package/src/transform/graphql.ts +8 -8
  53. package/src/transform/operation.ts +9 -9
  54. package/src/transform/select.ts +13 -13
  55. package/src/types.ts +1 -1
  56. package/src/utility.ts +7 -0
package/dist/apidef.d.ts CHANGED
@@ -3,7 +3,7 @@ import { KIT } from './types';
3
3
  import { parse } from './parse';
4
4
  import { nom, formatJSONIC, depluralize, sanitizeSlug, slugToPascalCase, getModelPath, VALID_CANON, CANON_ONE } from './utility';
5
5
  import { operationFacts, operationIndex, resolvedSpec } from './resolved';
6
- import type { OperationFacts, ResolvedSpec } from './resolved';
6
+ import type { OperationFacts, OperationSelector, ResolvedSpec } from './resolved';
7
7
  import { gcEntityFiles } from './builder/entity/entity';
8
8
  declare function warningsFileText(history: any[]): string;
9
9
  declare function ApiDef(opts: ApiDefOptions): {
@@ -20,4 +20,4 @@ export type { PathDef, MethodDef, ServerDef, ServerVariableDef, ParameterDef, Sc
20
20
  export type { CmpDesc, BasicMethodDesc, MethodDesc, MethodEntityDesc, EntityDesc, EntityPathDesc, PathDesc, OpDesc, } from './desc';
21
21
  export type { OpName, ArgKind, NamesCluster, ModelEntityRelations, ModelOpMap, ModelFieldOp, ModelField, ModelArg, ModelPoint, ModelOp, ModelEntity, Model, ModelEntityFlow, ModelEntityFlowStep, ModelEntityFlowStepInput, ModelEntityFlowStepValidator, ModelEntityFlowStepSpec, } from './model';
22
22
  export { KIT, ApiDef, gcEntityFiles, warningsFileText, parse, formatJSONIC, depluralize, sanitizeSlug, slugToPascalCase, getModelPath, nom, VALID_CANON, CANON_ONE, operationFacts, operationIndex, resolvedSpec, };
23
- export type { OperationFacts, ResolvedSpec, };
23
+ export type { OperationSelector, OperationFacts, ResolvedSpec, };
package/dist/apidef.js CHANGED
@@ -190,7 +190,7 @@ function ApiDef(opts) {
190
190
  fs.writeFileSync(defpath + '.full.json', fullsrc);
191
191
  }
192
192
  ctx.def = def;
193
- ctx.resolved = (0, resolved_1.publishResolved)(spec.buildctx, spec.config?.kind ?? "openapi3", def);
193
+ ctx.resolved = (0, resolved_1.publishResolved)(spec.buildctx, spec.config?.kind ?? "openapi3", def, () => ctx?.guide);
194
194
  steps.push('parse');
195
195
  // Step: guide (derive).
196
196
  if (!ctrl.step.guide) {
@@ -216,7 +216,7 @@ function ApiDef(opts) {
216
216
  await (0, top_1.topTransform)(ctx);
217
217
  await (0, entity_1.entityTransform)(ctx);
218
218
  await (0, operation_1.operationTransform)(ctx);
219
- // Must precede args and field: both branch on point.kind === 'graphql'
219
+ // Must precede args and field: both branch on point.k === 'graphql'
220
220
  // and read the graphql block this stamps on.
221
221
  await (0, graphql_1.graphqlTransform)(ctx);
222
222
  await (0, contract_1.contractTransform)(ctx);
@@ -1 +1 @@
1
- {"version":3,"file":"apidef.js","sourceRoot":"","sources":["../src/apidef.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"apidef.js","sourceRoot":"","sources":["../src/apidef.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,8 @@
1
1
  import type { ApiDefOptions } from '../../types';
2
2
  declare function resolveEntity(apimodel: any, opts: ApiDefOptions): () => void;
3
+ declare function entityAncestorSource(entity: any): {
4
+ model: any;
5
+ relations: string;
6
+ };
3
7
  declare function gcEntityFiles(fs: any, log: any, modelFolder: string, outprefix: string | undefined, entityNames: string[]): string[];
4
- export { resolveEntity, gcEntityFiles, };
8
+ export { resolveEntity, gcEntityFiles, entityAncestorSource, };
@@ -6,6 +6,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  exports.resolveEntity = resolveEntity;
8
8
  exports.gcEntityFiles = gcEntityFiles;
9
+ exports.entityAncestorSource = entityAncestorSource;
9
10
  const node_path_1 = __importDefault(require("node:path"));
10
11
  const jostraca_1 = require("jostraca");
11
12
  const types_1 = require("../../types");
@@ -18,13 +19,15 @@ function resolveEntity(apimodel, opts) {
18
19
  const entityFiles = [];
19
20
  (0, jostraca_1.each)(kit.entity, ((entity, entityName) => {
20
21
  const entityFile = (null == opts.outprefix ? '' : opts.outprefix) + entityName + '.aon';
21
- let entityJSONIC = (0, utility_1.formatJSONIC)(entity).trim();
22
+ const { model, relations } = entityAncestorSource(entity);
23
+ let entityJSONIC = (0, utility_1.formatJSONIC)(model).trim();
22
24
  entityJSONIC = entityJSONIC.substring(1, entityJSONIC.length - 1);
23
25
  const fieldAliasesSrc = fieldAliases(entity);
24
26
  const entitySrc = `# Entity: ${entity.name}\n\n` +
25
27
  `main: ${types_1.KIT}: entity: ${entity.name}: {\n\n` +
26
28
  ` alias: field: ${fieldAliasesSrc}\n` +
27
29
  entityJSONIC +
30
+ relations +
28
31
  '\n\n}\n';
29
32
  entityFiles.push({ name: entityFile, src: entitySrc });
30
33
  barrel.push(`@"./${node_path_1.default.basename(entityFile)}"`);
@@ -39,6 +42,19 @@ function resolveEntity(apimodel, opts) {
39
42
  });
40
43
  };
41
44
  }
45
+ function entityAncestorSource(entity) {
46
+ const model = { ...entity };
47
+ const ancestors = entity.relations?.ancestors ?? [];
48
+ if (null != entity.relations) {
49
+ model.relations = { ...entity.relations };
50
+ delete model.relations.ancestors;
51
+ if (0 === Object.keys(model.relations).length)
52
+ delete model.relations;
53
+ }
54
+ const chains = ancestors.map(chain => ' [' + chain.map(name => 'path(' + JSON.stringify('$.main.kit.entity.' + name) + ')').join(' ') + ']');
55
+ return { model, relations: 0 === chains.length ? '' :
56
+ '\n relations: ancestors: [\n' + chains.join('\n') + '\n ]' };
57
+ }
42
58
  function gcEntityFiles(fs, log, modelFolder, outprefix, entityNames) {
43
59
  const removed = [];
44
60
  const prefix = null == outprefix ? '' : outprefix;
@@ -1 +1 @@
1
- {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/builder/entity/entity.ts"],"names":[],"mappings":";AAAA,4CAA4C;;;;;QA8H1C,aAAa;QACb,aAAa;AA7Hf,0DAA4B;AAE5B,uCAAsD;AAQtD,uCAEoB;AAEpB,2CAEsB;AAItB,SAAS,aAAa,CACpB,QAAa,EACb,IAAmB;IAEnB,MAAM,GAAG,GAAa,QAAQ,CAAC,IAAI,CAAC,WAAG,CAAC,CAAA;IAExC,MAAM,MAAM,GAAG;QACb,mBAAmB;KACpB,CAAA;IAED,MAAM,WAAW,GAAoC,EAAE,CAAA;IAEvD,IAAA,eAAI,EAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,MAAW,EAAE,UAAkB,EAAE,EAAE;QACpD,MAAM,UAAU,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,UAAU,GAAG,MAAM,CAAA;QAEvF,IAAI,YAAY,GAAG,IAAA,sBAAY,EAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9C,YAAY,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;QAEjE,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,CAAC,CAAA;QAE5C,MAAM,SAAS,GACb,aAAa,MAAM,CAAC,IAAI,MAAM;YAC9B,SAAS,WAAG,aAAa,MAAM,CAAC,IAAI,SAAS;YAC7C,mBAAmB,eAAe,IAAI;YACtC,YAAY;YACZ,SAAS,CAAA;QAEX,WAAW,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;QAEtD,MAAM,CAAC,IAAI,CAAC,OAAO,mBAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;IAClD,CAAC,CAAC,CAAC,CAAA;IAEH,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,kBAAkB,CAAA;IAErF,OAAO,SAAS,gBAAgB;QAC9B,IAAA,iBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE;YAC9B,IAAA,eAAI,EAAC,WAAW,EAAE,CAAC,UAAU,EAAE,EAAE;gBAC/B,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,IAAA,kBAAO,EAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;YAChE,CAAC,CAAC,CAAA;YAEF,IAAA,eAAI,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,IAAA,kBAAO,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC7D,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;AACH,CAAC;AAGD,SAAS,aAAa,CACpB,EAAO,EACP,GAAQ,EACR,WAAmB,EACnB,SAA6B,EAC7B,WAAqB;IAErB,MAAM,OAAO,GAAa,EAAE,CAAA;IAC5B,MAAM,MAAM,GAAG,IAAI,IAAI,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAA;IACjD,MAAM,YAAY,GAAG,mBAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IAErD,MAAM,IAAI,GAAG,IAAI,GAAG,CAClB,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,MAAM,CAAC,CAAC,CAAA;IACpD,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,kBAAkB,CAAC,CAAA;IAErC,IAAI,OAAO,GAAa,EAAE,CAAA;IAC1B,IAAI,CAAC;QACH,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,IAAS,EAAE,CAAC;QACjB,OAAO,OAAO,CAAA,CAAC,4CAA4C;IAC7D,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAAC,SAAQ;QAAC,CAAC;QACtE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAAC,SAAQ;QAAC,CAAC;QAC3C,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAAC,SAAQ;QAAC,CAAC;QAEjC,MAAM,IAAI,GAAG,mBAAI,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;QAC3C,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;YACvD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;gBAAC,SAAQ;YAAC,CAAC;YAChD,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;YACnB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YACnB,GAAG,EAAE,IAAI,EAAE,CAAC;gBACV,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK;gBAC/B,IAAI,EAAE,sCAAsC,KAAK,mCAAmC;aACrF,CAAC,CAAA;QACJ,CAAC;QACD,OAAO,GAAQ,EAAE,CAAC;YAChB,GAAG,EAAE,IAAI,EAAE,CAAC;gBACV,KAAK,EAAE,kBAAkB,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG;gBAC3C,IAAI,EAAE,gBAAgB,KAAK,KAAK,GAAG,EAAE,OAAO,EAAE;aAC/C,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AAGD,SAAS,YAAY,CAAC,OAAY;IAChC,OAAO,IAAI,CAAA;AACb,CAAC"}
1
+ {"version":3,"file":"entity.js","sourceRoot":"","sources":["../../../src/builder/entity/entity.ts"],"names":[],"mappings":"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"}
@@ -45,11 +45,11 @@ function resolveBasicEntityFlow(ctx, entity) {
45
45
  const ent = data[id] = {};
46
46
  let num = (i * (0, struct_1.size)(apiEntity.fields) * 10);
47
47
  (0, jostraca_1.each)(apiEntity.fields, (field) => {
48
- ent[field.name] =
49
- 'number' === field.type ? num :
50
- 'boolean' === field.type ? 0 === num % 2 :
51
- 'object' === field.type ? {} :
52
- 'array' === field.type ? [] :
48
+ ent[field.n] =
49
+ 'number' === field.t ? num :
50
+ 'boolean' === field.t ? 0 === num % 2 :
51
+ 'object' === field.t ? {} :
52
+ 'array' === field.t ? [] :
53
53
  's' + (num.toString(16));
54
54
  num++;
55
55
  });
@@ -63,9 +63,9 @@ function resolveBasicEntityFlow(ctx, entity) {
63
63
  if (entop.load) {
64
64
  const point = findMainLoadPoint(entop.load);
65
65
  // Get additional required match properties
66
- (0, jostraca_1.each)(point?.args.params, (param) => {
67
- if (param.required) {
68
- let ancestorName = param.name;
66
+ (0, jostraca_1.each)(point?.g.params, (param) => {
67
+ if (param.r) {
68
+ let ancestorName = param.n;
69
69
  let ancestorEntity = apimodel.main.api.entity[ancestorName];
70
70
  if (null == ancestorEntity) {
71
71
  ancestorName = ancestorName.replace('_id', '');
@@ -75,9 +75,9 @@ function resolveBasicEntityFlow(ctx, entity) {
75
75
  flow.model.param[`${model.NAME}_TEST_${ancestorEntity.NAME}_ENTID`] = {
76
76
  [ancestorEntity.name + '01']: ancestorEntity.NAME + '01'
77
77
  };
78
- am[param.name] =
78
+ am[param.n] =
79
79
  `\`dm$=p.${model.NAME}_TEST_${ancestorEntity.NAME}_ENTID.${ancestorEntity.name}01\``;
80
- data[`${(0, utility_1.nom)(apiEntity, 'NAME')}01`][param.name] = ancestorEntity.NAME + '01';
80
+ data[`${(0, utility_1.nom)(apiEntity, 'NAME')}01`][param.n] = ancestorEntity.NAME + '01';
81
81
  }
82
82
  }
83
83
  });
@@ -139,17 +139,17 @@ function resolveBasicEntityFlow(ctx, entity) {
139
139
  return flow;
140
140
  }
141
141
  function findMainLoadPoint(op) {
142
- let cands = op.points.filter(a => 'id' === (0, struct_2.getelem)(a.segments, -1)?.var);
142
+ let cands = op.points.filter(a => 'id' === (0, struct_2.getelem)(a.s, -1)?.var);
143
143
  return cands[0];
144
144
  }
145
145
  function makeUpdateData(name, apiEntity, flow, id) {
146
146
  const ud = {};
147
147
  const data = flow.model.test.entity[apiEntity.name];
148
- const dataFields = (0, jostraca_1.each)(apiEntity.field).filter(f => 'id' !== f.name && !f.name.includes('_id'));
149
- const stringFields = (0, jostraca_1.each)(dataFields).filter(f => 'string' === f.type);
148
+ const dataFields = (0, jostraca_1.each)(apiEntity.fields).filter(f => 'id' !== f.n && !f.n.includes('_id'));
149
+ const stringFields = (0, jostraca_1.each)(dataFields).filter(f => 'string' === f.t);
150
150
  if (0 < (0, struct_1.size)(stringFields)) {
151
151
  const f = stringFields[0];
152
- ud[f.name] = data[id][f.name] + '-`$WHEN`';
152
+ ud[f.n] = data[id][f.n] + '-`$WHEN`';
153
153
  }
154
154
  return ud;
155
155
  }
@@ -1 +1 @@
1
- {"version":3,"file":"flowHeuristic01.js","sourceRoot":"","sources":["../../../src/builder/flow/flowHeuristic01.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"flowHeuristic01.js","sourceRoot":"","sources":["../../../src/builder/flow/flowHeuristic01.ts"],"names":[],"mappings":"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"}
package/dist/model.d.ts CHANGED
@@ -33,15 +33,16 @@ type ModelFieldOp = {
33
33
  req: boolean;
34
34
  };
35
35
  type ModelField = {
36
- name: string;
37
- type: any;
38
- req: boolean;
36
+ n: string;
37
+ h: string;
38
+ t: any;
39
+ r: boolean;
39
40
  op: Partial<Record<OpName, ModelFieldOp>>;
40
- short?: string;
41
- readOnly?: boolean;
42
- writeOnly?: boolean;
43
- deprecated?: boolean;
44
- format?: string;
41
+ sh?: string;
42
+ ro?: boolean;
43
+ wo?: boolean;
44
+ de?: boolean;
45
+ fo?: string;
45
46
  union?: {
46
47
  count: number;
47
48
  branches: number;
@@ -49,12 +50,12 @@ type ModelField = {
49
50
  };
50
51
  };
51
52
  type ModelArg = {
52
- name: string;
53
- orig: string;
54
- type: any;
55
- kind: ArgKind;
56
- reqd: boolean;
57
- example?: any;
53
+ n: string;
54
+ or?: string;
55
+ t: any;
56
+ k: ArgKind;
57
+ r: boolean;
58
+ ex?: any;
58
59
  };
59
60
  type PointKind = 'http' | 'graphql';
60
61
  type ModelGraphqlPage = {
@@ -80,34 +81,34 @@ type ModelPathSegment = {
80
81
  var?: string;
81
82
  };
82
83
  type ModelPoint = {
83
- contract?: {
84
- version: number;
84
+ co?: {
85
+ version: 2;
85
86
  id: string;
86
87
  source: string;
87
- json: string;
88
88
  };
89
- orig: string;
90
- kind?: PointKind;
91
- graphql?: ModelGraphql;
92
- method: MethodName;
93
- segments: ModelPathSegment[];
94
- rename: Partial<{
89
+ li?: boolean | Record<string, any>;
90
+ o: string;
91
+ k?: PointKind;
92
+ gq?: ModelGraphql;
93
+ m: MethodName;
94
+ s: ModelPathSegment[];
95
+ r: Partial<{
95
96
  param: Record<string, string>;
96
97
  query: Record<string, string>;
97
98
  header: Record<string, string>;
98
99
  cookie: Record<string, string>;
99
100
  }>;
100
- args: Partial<{
101
+ g: Partial<{
101
102
  params: ModelArg[];
102
103
  query: ModelArg[];
103
104
  header: ModelArg[];
104
105
  cookie: ModelArg[];
105
106
  }>;
106
- transform: {
107
+ t: {
107
108
  req?: any;
108
109
  res?: any;
109
110
  };
110
- select: {
111
+ q: {
111
112
  exist: string[];
112
113
  $action?: string;
113
114
  };
@@ -121,7 +122,7 @@ type ModelEntity = {
121
122
  Name?: string;
122
123
  NAME?: string;
123
124
  op: ModelOpMap;
124
- fields: ModelField[];
125
+ fields: Record<string, ModelField>;
125
126
  id?: {
126
127
  name: string;
127
128
  field: string;
@@ -161,11 +162,12 @@ type ModelEntityFlowStepSpec = {
161
162
  def: Record<string, any>;
162
163
  };
163
164
  type ModelEntityFlowStep = {
164
- op: OpName;
165
- input: ModelEntityFlowStepInput;
166
- match: Record<string, any>;
167
- data: Record<string, any>;
168
- spec: ModelEntityFlowStepSpec[];
169
- valid: ModelEntityFlowStepValidator[];
165
+ a?: boolean;
166
+ o: OpName;
167
+ i: ModelEntityFlowStepInput;
168
+ m: Record<string, any>;
169
+ d: Record<string, any>;
170
+ s: ModelEntityFlowStepSpec[];
171
+ v: ModelEntityFlowStepValidator[];
170
172
  };
171
173
  export type { OpName, ArgKind, PointKind, ModelGraphql, ModelGraphqlVar, ModelGraphqlPage, NamesCluster, Model, ModelEntityRelations, ModelOpMap, ModelFieldOp, ModelField, ModelArg, ModelPoint, ModelPathSegment, ModelOp, ModelEntity, ModelEntityFlow, ModelEntityFlowStep, ModelEntityFlowStepInput, ModelEntityFlowStepValidator, ModelEntityFlowStepSpec, };
@@ -3,21 +3,25 @@ type OperationFacts = {
3
3
  protocol: 'http' | 'graphql';
4
4
  [key: string]: any;
5
5
  };
6
+ type OperationSelector = {
7
+ entity: string;
8
+ op: string;
9
+ };
6
10
  type ResolvedSpec = {
7
11
  version: 1;
8
12
  kind: string;
9
13
  def: any;
10
- operation(method: string, path: string): OperationFacts | undefined;
14
+ operation(method: string, path: string, selector?: OperationSelector): OperationFacts | undefined;
11
15
  };
12
16
  declare function operationFacts(def: any, point: {
13
- method: string;
14
- orig: string;
17
+ m: string;
18
+ o: string;
15
19
  }): OperationFacts | undefined;
16
20
  declare function operationIndex(def: any): {
17
21
  [id: string]: OperationFacts;
18
22
  };
19
- declare function makeResolved(kind: string, def: any): ResolvedSpec;
20
- declare function publishResolved(ctx: any, kind: string, def: any): ResolvedSpec;
23
+ declare function makeResolved(kind: string, def: any, guide?: () => any): ResolvedSpec;
24
+ declare function publishResolved(ctx: any, kind: string, def: any, guide?: () => any): ResolvedSpec;
21
25
  declare function resolvedSpec(carrier: any): ResolvedSpec | undefined;
22
- export type { OperationFacts, ResolvedSpec, };
26
+ export type { OperationSelector, OperationFacts, ResolvedSpec, };
23
27
  export { METHODS, operationFacts, operationIndex, makeResolved, publishResolved, resolvedSpec, };
package/dist/resolved.js CHANGED
@@ -8,23 +8,39 @@ exports.makeResolved = makeResolved;
8
8
  exports.publishResolved = publishResolved;
9
9
  exports.resolvedSpec = resolvedSpec;
10
10
  // See docs/design/resolved-spec-capability.md
11
- const contract_1 = require("./transform/contract");
11
+ // An operation needs its argument types, including recursive input objects.
12
+ // Output types are represented by the field and generated invocation selection;
13
+ // copying the entire connected output graph per operation is quadratic in API size.
14
+ function graphqlInputTypes(field, types) {
15
+ const out = {};
16
+ function visit(name) {
17
+ if (!types[name] || Object.prototype.hasOwnProperty.call(out, name))
18
+ return;
19
+ const type = types[name];
20
+ out[name] = type;
21
+ if (type.kind === 'INPUT_OBJECT') {
22
+ for (const child of Object.values(type.fields || {}))
23
+ visit(child.type);
24
+ }
25
+ }
26
+ for (const arg of field.args || [])
27
+ visit(arg.type);
28
+ return out;
29
+ }
12
30
  const METHODS = [
13
31
  'get', 'put', 'post', 'delete', 'options', 'head', 'patch', 'trace'
14
32
  ];
15
33
  exports.METHODS = METHODS;
16
- // The single definition of a resolved operation, shared by contractTransform
17
- // and by consumers of the capability, so the two cannot disagree.
18
34
  function operationFacts(def, point) {
19
- const path = def?.paths?.[point.orig];
20
- const method = path?.[String(point.method).toLowerCase()];
21
- const graphql = def?.query?.[point.orig] || def?.mutation?.[point.orig];
35
+ const path = def?.paths?.[point.o];
36
+ const method = path?.[String(point.m).toLowerCase()];
37
+ const graphql = def?.query?.[point.o] || def?.mutation?.[point.o];
22
38
  if (!method && !graphql)
23
39
  return undefined;
24
40
  const facts = { protocol: graphql ? 'graphql' : 'http' };
25
41
  if (graphql) {
26
42
  facts.field = graphql;
27
- facts.types = (0, contract_1.graphqlInputTypes)(graphql, def.types || {});
43
+ facts.types = graphqlInputTypes(graphql, def.types || {});
28
44
  facts.typesScope = 'inputs';
29
45
  return facts;
30
46
  }
@@ -43,38 +59,72 @@ function operationFacts(def, point) {
43
59
  facts.produces ??= def.produces;
44
60
  return facts;
45
61
  }
46
- // Every described operation, keyed 'METHOD path' as `point.contract.id` is.
62
+ // Every described operation, keyed 'METHOD path' as `point.co.id` is.
47
63
  function operationIndex(def) {
48
64
  const out = {};
49
65
  for (const path of Object.keys(def?.paths || {})) {
50
66
  for (const method of METHODS) {
51
67
  if (null == def.paths[path]?.[method])
52
68
  continue;
53
- const facts = operationFacts(def, { method, orig: path });
69
+ const facts = operationFacts(def, { m: method, o: path });
54
70
  if (facts)
55
71
  out[method.toUpperCase() + ' ' + path] = facts;
56
72
  }
57
73
  }
58
74
  for (const kind of ['query', 'mutation']) {
59
75
  for (const field of Object.keys(def?.[kind] || {})) {
60
- const facts = operationFacts(def, { method: 'POST', orig: field });
76
+ const facts = operationFacts(def, { m: 'POST', o: field });
61
77
  if (facts)
62
78
  out['POST ' + field] = facts;
63
79
  }
64
80
  }
65
81
  return out;
66
82
  }
67
- function makeResolved(kind, def) {
83
+ function operationGuide(guide, method, path, graphql, selector) {
84
+ const matches = [];
85
+ for (const [entityName, entity] of Object.entries(guide?.entity || {})) {
86
+ if (selector && selector.entity !== entityName)
87
+ continue;
88
+ const ops = entity[graphql ? 'field' : 'path']?.[path]?.op || {};
89
+ for (const [opName, op] of Object.entries(ops)) {
90
+ if (selector && selector.op !== opName)
91
+ continue;
92
+ if (op.method && op.method.toUpperCase() !== method.toUpperCase())
93
+ continue;
94
+ if (op.contract !== undefined || op.live !== undefined)
95
+ matches.push(op);
96
+ }
97
+ }
98
+ if (matches.length > 1) {
99
+ throw new Error('Ambiguous operation guide for ' + method + ' ' + path + '; select entity and op');
100
+ }
101
+ return matches[0];
102
+ }
103
+ function makeResolved(kind, def, guide = () => undefined) {
68
104
  return {
69
105
  version: 1,
70
106
  kind,
71
107
  def,
72
- operation: (method, path) => operationFacts(def, { method, orig: path }),
108
+ operation: (method, path, selector) => {
109
+ const facts = operationFacts(def, { m: method, o: path });
110
+ if (!facts)
111
+ return undefined;
112
+ const op = operationGuide(guide(), method, path, facts.protocol === 'graphql', selector);
113
+ for (const key of ['requestBody', 'responses', 'parameters', 'security']) {
114
+ if (op?.contract?.[key] !== undefined) {
115
+ facts[key] = op.contract[key];
116
+ (facts.factSources ??= {})[key] = 'guide';
117
+ }
118
+ }
119
+ if (op?.live !== undefined)
120
+ facts.live = op.live;
121
+ return facts;
122
+ },
73
123
  };
74
124
  }
75
125
  // Tolerates a missing context: apidef also runs outside a model build.
76
- function publishResolved(ctx, kind, def) {
77
- const resolved = makeResolved(kind, def);
126
+ function publishResolved(ctx, kind, def, guide) {
127
+ const resolved = makeResolved(kind, def, guide);
78
128
  if (null != ctx && 'object' === typeof ctx) {
79
129
  ctx.state = ctx.state || {};
80
130
  ctx.state.apidef = { ...(ctx.state.apidef || {}), resolved };
@@ -84,7 +134,7 @@ function publishResolved(ctx, kind, def) {
84
134
  function resolvedSpec(carrier) {
85
135
  if (null == carrier || 'object' !== typeof carrier)
86
136
  return undefined;
87
- return carrier.state?.apidef?.resolved ??
137
+ return carrier.resolved ?? carrier.ctx?.resolved ?? carrier.state?.apidef?.resolved ??
88
138
  carrier.ctx?.state?.apidef?.resolved ??
89
139
  carrier.apidef?.resolved ??
90
140
  undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"resolved.js","sourceRoot":"","sources":["../src/resolved.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"resolved.js","sourceRoot":"","sources":["../src/resolved.ts"],"names":[],"mappings":"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"}