@mxpicture/gcp-functions-common 1.1.64 → 1.1.66

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.
@@ -1 +1 @@
1
- {"version":3,"file":"anno.property.d.ts","sourceRoot":"","sources":["../../src/annotation/anno.property.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAKzC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,gBAAgB,EAC/D,UAAU,MAAM,EAChB,aAAa,MAAM,EACnB,MAAM,eAAe,CAAC,CAAC,CAAC,KACvB,mBAAmB,CAAC,CAAC,CAgBvB,CAAC"}
1
+ {"version":3,"file":"anno.property.d.ts","sourceRoot":"","sources":["../../src/annotation/anno.property.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EACL,gBAAgB,EAChB,eAAe,EAChB,MAAM,iCAAiC,CAAC;AAKzC;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,gBAAgB,EAC/D,UAAU,MAAM,EAChB,aAAa,MAAM,EACnB,MAAM,eAAe,CAAC,CAAC,CAAC,KACvB,mBAAmB,CAAC,CAAC,CAqBvB,CAAC"}
@@ -1,5 +1,7 @@
1
+ import { castDecoEnum } from "../decorator/deco.cast.js";
1
2
  import { buildEnumName, DecoPropertyType } from "../decorator/deco.enum.js";
2
3
  import { Decorator } from "../decorator/Decorator.js";
4
+ import { EnumRegistry } from "../helper/EnumRegistry.js";
3
5
  const isDecoObjectData = (data) => data.type === DecoPropertyType.object && "deco" in data;
4
6
  /**
5
7
  * Maps a single raw decorator property into an {@link AnnotationsProperty}.
@@ -17,10 +19,16 @@ const isDecoObjectData = (data) => data.type === DecoPropertyType.object && "dec
17
19
  export const mapAnnotationsProperty = (headName, propertyKey, prop) => {
18
20
  const decoRef = isDecoObjectData(prop.data) ? prop.data.deco : null;
19
21
  const sub = decoRef instanceof Decorator ? decoRef : null;
20
- const propertyType = sub?.name ??
21
- (prop.data.type === DecoPropertyType.enum
22
- ? buildEnumName(headName, propertyKey)
23
- : prop.data.type);
22
+ let propertyType = sub?.name;
23
+ if (!propertyType && prop.data.type === DecoPropertyType.enum) {
24
+ propertyType = buildEnumName(headName, propertyKey);
25
+ const data = castDecoEnum(prop.data);
26
+ const reg = EnumRegistry.instance().getItem(propertyType);
27
+ if (data && reg)
28
+ data.values = Object.keys(reg.keyTexts);
29
+ }
30
+ if (!propertyType)
31
+ propertyType = prop.data.type;
24
32
  return structuredClone({
25
33
  ...prop,
26
34
  propertyKey,
@@ -1 +1 @@
1
- {"version":3,"file":"anno.property.js","sourceRoot":"","sources":["../../src/annotation/anno.property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAOtD,MAAM,gBAAgB,GAAG,CAAC,IAAsB,EAA0B,EAAE,CAC1E,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,MAAM,IAAI,MAAM,IAAI,IAAI,CAAC;AAE1D;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAgB,EAChB,WAAmB,EACnB,IAAwB,EACA,EAAE;IAC1B,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,MAAM,GAAG,GAAG,OAAO,YAAY,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1D,MAAM,YAAY,GAChB,GAAG,EAAE,IAAI;QACT,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI;YACvC,CAAC,CAAC,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC;YACtC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEtB,OAAO,eAAe,CAAC;QACrB,GAAG,IAAI;QACP,WAAW;QACX,YAAY;QACZ,GAAG,EAAE,GAAG,EAAE,kBAAkB,EAAE;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"anno.property.js","sourceRoot":"","sources":["../../src/annotation/anno.property.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE5E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAOzD,MAAM,gBAAgB,GAAG,CAAC,IAAsB,EAA0B,EAAE,CAC1E,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,MAAM,IAAI,MAAM,IAAI,IAAI,CAAC;AAE1D;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAgB,EAChB,WAAmB,EACnB,IAAwB,EACA,EAAE;IAC1B,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACpE,MAAM,GAAG,GAAG,OAAO,YAAY,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAE1D,IAAI,YAAY,GAAG,GAAG,EAAE,IAAI,CAAC;IAE7B,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAC9D,YAAY,GAAG,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC1D,IAAI,IAAI,IAAI,GAAG;YAAE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,CAAC,YAAY;QAAE,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IAEjD,OAAO,eAAe,CAAC;QACrB,GAAG,IAAI;QACP,WAAW;QACX,YAAY;QACZ,GAAG,EAAE,GAAG,EAAE,kBAAkB,EAAE;KAC/B,CAAC,CAAC;AACL,CAAC,CAAC"}
@@ -15,7 +15,7 @@ export const decoEnum = () => new DecoEnum();
15
15
  export class DecoEnum extends DecoProperty {
16
16
  /** Creates a new enum property builder with default settings. */
17
17
  constructor() {
18
- super({ type: DecoPropertyType.enum, values: [], enumName: "" });
18
+ super({ type: DecoPropertyType.enum, values: [] });
19
19
  }
20
20
  /**
21
21
  * Sets the enum values.
@@ -1 +1 @@
1
- {"version":3,"file":"DecoEnum.js","sourceRoot":"","sources":["../../src/decorator/DecoEnum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AASjD;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,OAAO,QAAS,SAAQ,YAA0B;IACtD,iEAAiE;IACjE;QACE,KAAK,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;IACnE,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,GAAG,MAAgB;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"DecoEnum.js","sourceRoot":"","sources":["../../src/decorator/DecoEnum.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AASjD;;;;GAIG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,IAAI,QAAQ,EAAE,CAAC;AAE7C;;;;;GAKG;AACH,MAAM,OAAO,QAAS,SAAQ,YAA0B;IACtD,iEAAiE;IACjE;QACE,KAAK,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,GAAG,MAAgB;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
@@ -1,8 +1,10 @@
1
1
  import { Decorator } from "../decorator/Decorator.js";
2
2
  import { EnumRegistryItem, EnumRegistryKeyTexts } from "../types/types.enum.registry.js";
3
3
  export declare class EnumRegistry {
4
+ protected static _instance: EnumRegistry | null;
4
5
  protected items: EnumRegistryItem[];
5
- constructor();
6
+ static instance(): EnumRegistry;
7
+ protected constructor();
6
8
  addValue(name: string, keyTexts: EnumRegistryKeyTexts): EnumRegistryItem;
7
9
  getItem(name: string): EnumRegistryItem | null;
8
10
  getItems(): EnumRegistryItem[];
@@ -1 +1 @@
1
- {"version":3,"file":"EnumRegistry.d.ts","sourceRoot":"","sources":["../../src/helper/EnumRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AAEzC,qBAAa,YAAY;IACvB,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;;IAIlC,QAAQ,CACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,oBAAoB,GAC7B,gBAAgB;IAUZ,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAI9C,QAAQ,IAAI,gBAAgB,EAAE;IAI9B,kBAAkB,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAI3D,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAK1D"}
1
+ {"version":3,"file":"EnumRegistry.d.ts","sourceRoot":"","sources":["../../src/helper/EnumRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACrB,MAAM,iCAAiC,CAAC;AAEzC,qBAAa,YAAY;IACvB,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,YAAY,GAAG,IAAI,CAAQ;IACvD,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAM;WAE3B,QAAQ,IAAI,YAAY;IAKtC,SAAS;IAEF,QAAQ,CACb,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,oBAAoB,GAC7B,gBAAgB;IAUZ,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAI9C,QAAQ,IAAI,gBAAgB,EAAE;IAI9B,kBAAkB,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI;IAI3D,SAAS,CAAC,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;CAK1D"}
@@ -1,5 +1,11 @@
1
1
  export class EnumRegistry {
2
+ static _instance = null;
2
3
  items = [];
4
+ static instance() {
5
+ if (!this._instance)
6
+ this._instance = new EnumRegistry();
7
+ return this._instance;
8
+ }
3
9
  constructor() { }
4
10
  addValue(name, keyTexts) {
5
11
  let found = this.getItem(name);
@@ -1 +1 @@
1
- {"version":3,"file":"EnumRegistry.js","sourceRoot":"","sources":["../../src/helper/EnumRegistry.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,YAAY;IACb,KAAK,GAAuB,EAAE,CAAC;IAEzC,gBAAsB,CAAC;IAEhB,QAAQ,CACb,IAAY,EACZ,QAA8B;QAE9B,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAE9D,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;YAChD,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QAE7B,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,kBAAkB,CAAC,GAAG,UAAuB;QAClD,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IACzE,CAAC;IAES,mBAAmB,CAAC,SAAoB;QAChD,SAAS;aACN,UAAU,EAAE;aACZ,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E,CAAC;CACF"}
1
+ {"version":3,"file":"EnumRegistry.js","sourceRoot":"","sources":["../../src/helper/EnumRegistry.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,YAAY;IACb,MAAM,CAAC,SAAS,GAAwB,IAAI,CAAC;IAC7C,KAAK,GAAuB,EAAE,CAAC;IAElC,MAAM,CAAC,QAAQ;QACpB,IAAI,CAAC,IAAI,CAAC,SAAS;YAAE,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;QACzD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,gBAAyB,CAAC;IAEnB,QAAQ,CACb,IAAY,EACZ,QAA8B;QAE9B,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK;YAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;QAE9D,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;YAChD,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;QAE7B,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,OAAO,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,kBAAkB,CAAC,GAAG,UAAuB;QAClD,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IACzE,CAAC;IAES,mBAAmB,CAAC,SAAoB;QAChD,SAAS;aACN,UAAU,EAAE;aACZ,aAAa,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9E,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mxpicture/gcp-functions-common",
3
- "version": "1.1.64",
3
+ "version": "1.1.66",
4
4
  "description": "Utils for google cloud functions, publishing both CommonJS and ESM builds",
5
5
  "type": "module",
6
6
  "author": "MXPicture",