@shadimakhoul/ggcoach 1.0.7 → 1.0.9

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":"openapi.d.ts","sourceRoot":"","sources":["../../utils/openapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,OAAO,EAAE,YAAY,EAA0B,WAAW,EAA0B,MAAM,UAAU,CAAC;AASrG,eAAO,MAAM,2BAA2B,QACjC,OAAO,YACF,WAAW,YACZ,YAAY,KACpB,WAiBF,CAAC"}
1
+ {"version":3,"file":"openapi.d.ts","sourceRoot":"","sources":["../../utils/openapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,OAAO,EAAE,YAAY,EAA0B,WAAW,EAA0B,MAAM,UAAU,CAAC;AASrG,eAAO,MAAM,2BAA2B,QACjC,OAAO,YACF,WAAW,YACZ,YAAY,KACpB,WAmBF,CAAC"}
@@ -14,7 +14,8 @@ const buildOpenApiSpecFromExpress = (app, baseSpec, options = {}) => {
14
14
  const endpoints = (0, express_list_endpoints_1.default)(app);
15
15
  const basePaths = getRecord(baseSpec.paths);
16
16
  const schemas = extractSchemasFromApp(app);
17
- const generatedPaths = buildPathsFromEndpoints(endpoints, options.tagResolver, schemas);
17
+ const middlewares = extractMiddlewaresFromApp(app);
18
+ const generatedPaths = buildPathsFromEndpoints(endpoints, options.tagResolver, schemas, middlewares);
18
19
  return {
19
20
  ...baseSpec,
20
21
  paths: {
@@ -74,7 +75,58 @@ const extractSchemasFromApp = (app) => {
74
75
  }
75
76
  return schemas;
76
77
  };
77
- const buildPathsFromEndpoints = (endpoints, tagResolver, schemas) => {
78
+ const extractMiddlewaresFromApp = (app) => {
79
+ const middlewares = {};
80
+ const inspectLayer = (layer, prefix = "") => {
81
+ if (!layer)
82
+ return;
83
+ // If this layer has a route
84
+ if (layer.route) {
85
+ const routePath = normalizePath(prefix + layer.route.path);
86
+ layer.route.stack.forEach((handler) => {
87
+ const method = handler.method;
88
+ const middlewareKey = `${method}_${routePath}`;
89
+ if (!middlewares[middlewareKey]) {
90
+ middlewares[middlewareKey] = [];
91
+ }
92
+ // Collect middleware names from the handler
93
+ if (handler.name && handler.name !== 'anonymous' && handler.name !== '<anonymous>') {
94
+ middlewares[middlewareKey].push(handler.name);
95
+ }
96
+ // Also check the handle function name
97
+ if (handler.handle && handler.handle.name &&
98
+ handler.handle.name !== 'anonymous' &&
99
+ handler.handle.name !== '<anonymous>') {
100
+ middlewares[middlewareKey].push(handler.handle.name);
101
+ }
102
+ });
103
+ }
104
+ // If this layer is a router
105
+ else if (layer.handle && layer.handle.stack) {
106
+ let newPrefix = prefix;
107
+ if (layer.regexp && layer.regexp.source !== "^\\/?$") {
108
+ const match = layer.regexp.source
109
+ .replace("\\/?", "")
110
+ .replace("(?=\\/|$)", "")
111
+ .replace("^", "")
112
+ .replace("$", "")
113
+ .replace(/\\\//g, "/");
114
+ newPrefix = normalizePath(`${prefix}/${match}`.replace(/\/+/g, '/'));
115
+ }
116
+ layer.handle.stack.forEach((sublayer) => {
117
+ inspectLayer(sublayer, newPrefix);
118
+ });
119
+ }
120
+ };
121
+ // Traverse the app's router stack
122
+ if (app._router && app._router.stack) {
123
+ app._router.stack.forEach((layer) => {
124
+ inspectLayer(layer);
125
+ });
126
+ }
127
+ return middlewares;
128
+ };
129
+ const buildPathsFromEndpoints = (endpoints, tagResolver, schemas, middlewares) => {
78
130
  const paths = {};
79
131
  const allowedMethods = new Set(["GET", "POST", "PUT", "DELETE", "PATCH"]);
80
132
  endpoints.forEach((endpoint) => {
@@ -94,8 +146,12 @@ const buildPathsFromEndpoints = (endpoints, tagResolver, schemas) => {
94
146
  return;
95
147
  }
96
148
  const tags = tagResolver ? tagResolver(path, methodKey) : undefined;
97
- console.log(endpoint.middlewares);
98
- const requiresAuth = endpoint.middlewares.some((m) => AUTH_MIDDLEWARES.has(m));
149
+ // Check middlewares specific to this method and path
150
+ const middlewareKey = `${methodKey}_${path}`;
151
+ console.log(middlewareKey);
152
+ const methodMiddlewares = middlewares?.[middlewareKey] || [];
153
+ const requiresAuth = methodMiddlewares.some((m) => AUTH_MIDDLEWARES.has(m));
154
+ console.log(requiresAuth);
99
155
  const pathSpec = {
100
156
  summary: `${method} ${path}`,
101
157
  ...(tags && tags.length > 0 ? { tags } : {}),
@@ -1 +1 @@
1
- {"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../utils/openapi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../utils/openapi.ts"],"names":[],"mappings":";;;;;;AACA,oFAAmD;AAKnD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC;IAC/B,mBAAmB;IACnB,cAAc;IACd,mBAAmB;CACpB,CAAC,CAAC;AAEI,MAAM,2BAA2B,GAAG,CACzC,GAAY,EACZ,QAAqB,EACrB,UAAwB,EAAE,EACb,EAAE;IACf,MAAM,SAAS,GAAG,IAAA,gCAAa,EAAC,GAAG,CAAe,CAAC;IACnD,MAAM,SAAS,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAiB,CAAC;IAC5D,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,WAAW,GAAG,yBAAyB,CAAC,GAAG,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,uBAAuB,CAC5C,SAAS,EACT,OAAO,CAAC,WAAW,EACnB,OAAO,EACP,WAAW,CACZ,CAAC;IAEF,OAAO;QACL,GAAG,QAAQ;QACX,KAAK,EAAE;YACL,GAAG,UAAU,CAAC,SAAS,EAAE,cAAc,CAAC;SACzC;KACF,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,2BAA2B,+BAuBtC;AAEF,MAAM,SAAS,GAAG,CAAC,KAAc,EAA2B,EAAE;IAC5D,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,KAAgC,CAAC;IAC1C,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAGF,MAAM,qBAAqB,GAAG,CAAC,GAAY,EAAa,EAAE;IACxD,MAAM,OAAO,GAAc,EAAE,CAAC;IAE9B,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,SAAiB,EAAE,EAAQ,EAAE;QAC7D,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,4BAA4B;QAC5B,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE3D,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBACzC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAa,CAAC;gBAErC,IAAI,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,YAAY,EAAE,CAAC;oBAC3C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;oBAE9B,MAAM,SAAS,GAAG,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC;oBAE3C,OAAO,CAAC,SAAS,CAAC,GAAG;wBACnB,MAAM,EAAE,MAAM,CAAC,QAAQ;wBACvB,IAAI,EAAE,MAAM,CAAC,YAAY;qBAC1B,CAAC;gBACJ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,4BAA4B;aACvB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC5C,IAAI,SAAS,GAAG,MAAM,CAAC;YAEvB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM;qBAC9B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;qBACnB,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;qBACxB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;qBAChB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;qBAChB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAEzB,SAAS,GAAG,aAAa,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;YACvE,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAa,EAAE,EAAE;gBAC3C,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IACF,kCAAkC;IAClC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YACvC,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,GAAY,EAA4B,EAAE;IAC3E,MAAM,WAAW,GAA6B,EAAE,CAAC;IAEjD,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,SAAiB,EAAE,EAAQ,EAAE;QAC7D,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,4BAA4B;QAC5B,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,SAAS,GAAG,aAAa,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAE3D,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAY,EAAE,EAAE;gBACzC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;gBAC9B,MAAM,aAAa,GAAG,GAAG,MAAM,IAAI,SAAS,EAAE,CAAC;gBAE/C,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;oBAChC,WAAW,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC;gBAClC,CAAC;gBAED,4CAA4C;gBAC5C,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACnF,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChD,CAAC;gBAED,sCAAsC;gBACtC,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI;oBACrC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;oBACnC,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBAC1C,WAAW,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;gBACvD,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,4BAA4B;aACvB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC5C,IAAI,SAAS,GAAG,MAAM,CAAC;YAEvB,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;gBACrD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM;qBAC9B,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;qBACnB,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;qBACxB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;qBAChB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;qBAChB,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAEzB,SAAS,GAAG,aAAa,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;YACvE,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,QAAa,EAAE,EAAE;gBAC3C,YAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;IAEF,kCAAkC;IAClC,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YACvC,YAAY,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,uBAAuB,GAAG,CAC9B,SAAqB,EACrB,WAAyB,EACzB,OAAmB,EACnB,WAAsC,EACxB,EAAE;IAEhB,MAAM,KAAK,GAAiB,EAAE,CAAC;IAC/B,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1E,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QAED,QAAQ,CAAC,OAAO;aACb,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;aACrC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;aAC9C,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAClB,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjB,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;YACnB,CAAC;YAED,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3B,OAAO;YACT,CAAC;YAED,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAEpE,qDAAqD;YACrD,MAAM,aAAa,GAAG,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC3B,MAAM,iBAAiB,GAAG,WAAW,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YAC7D,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChD,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CACxB,CAAC;YACF,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;YAE1B,MAAM,QAAQ,GAA4B;gBACxC,OAAO,EAAE,GAAG,MAAM,IAAI,IAAI,EAAE;gBAC5B,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5C,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,SAAS,EAAE;oBACT,KAAK,EAAE;wBACL,WAAW,EAAE,SAAS;qBACvB;iBACF;aACF,CAAC;YAEF,mCAAmC;YACnC,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;gBACpB,MAAM,SAAS,GAAG,GAAG,SAAS,IAAI,IAAI,EAAE,CAAC;gBACzC,MAAM,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;gBACtC,IAAI,UAAU,EAAE,CAAC;oBACf,IAAI,SAAkC,CAAC;oBACvC,IAAI,UAAU,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;wBAC9B,SAAS,GAAG,YAAY,CAAC,UAAU,CAAC,MAAmB,CAAC,CAAC;oBAC3D,CAAC;yBAAM,CAAC;wBACN,OAAO;oBACT,CAAC;oBAED,QAAQ,CAAC,WAAW,GAAG;wBACrB,QAAQ,EAAE,IAAI;wBACd,OAAO,EAAE;4BACP,kBAAkB,EAAE;gCAClB,MAAM,EAAE,SAAS;6BAClB;yBACF;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;QACpC,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,CAAC,IAAY,EAAW,EAAE;IAC/C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAY,EAAU,EAAE;IAC7C,MAAM,OAAO,GACX,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnE,OAAO,OAAO,IAAI,GAAG,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CACjB,SAAuB,EACvB,cAA4B,EACd,EAAE;IAChB,MAAM,MAAM,GAAiB,EAAE,GAAG,cAAc,EAAE,CAAC;IAEnD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE;QACpD,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5C,MAAM,CAAC,IAAI,CAAC,GAAG;YACb,GAAG,gBAAgB;YACnB,GAAG,OAAO;SACX,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,MAAW,EAA2B,EAAE;IAC5D,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;IAEvB,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,MAAM,KAAK,GACT,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU;YAC7B,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE;YACb,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;QAEhB,MAAM,UAAU,GAA4B,EAAE,CAAC;QAC/C,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAQ,GAAG,CAAC;YAEvB,MAAM,IAAI,GAA4B;gBACpC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,EAAE,IAAI,IAAI,QAAQ;aAChD,CAAC;YAEF,UAAU,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;YACvB,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,CAAC;QAED,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,UAAU;YACV,QAAQ;SACT,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;AAC5B,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shadimakhoul/ggcoach",
3
- "version": "1.0.7",
3
+ "version": "1.0.9",
4
4
  "description": "Shared utilities and types for GGCoach microservices",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",