prostgles-server 4.2.94 → 4.2.95

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":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI9D,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAmB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGjK,qBAAa,aAAa;IACxB,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAC/D,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAA;IACN,SAAS,EAAE,SAAS,CAAC;gBAET,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS;IAWzJ,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAW3F,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAqBrI;;;;OAIG;IACG,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAcrF,2BAA2B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAOrG,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAyC1H,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAWrG,6BAA6B,uIAA4C;IAGzE,oBAAoB;;;;;;;;;;;OAAmC;CAExD;AAED,cAAc,wBAAwB,CAAC"}
1
+ {"version":3,"file":"PublishParser.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAqB,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAI9D,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,kBAAkB,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAmB,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGjK,qBAAa,aAAa;IACxB,OAAO,EAAE,GAAG,CAAC;IACb,cAAc,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,CAAC;IAC/D,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,GAAG,EAAE,eAAe,CAAC;IACrB,EAAE,EAAE,EAAE,CAAA;IACN,SAAS,EAAE,SAAS,CAAC;gBAET,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,WAAW,CAAC,GAAG,SAAS,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,SAAS;IAWzJ,gBAAgB,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAW3F,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,SAAS,GAAG,QAAQ,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAsBrI;;;;OAIG;IACG,UAAU,CAAC,WAAW,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,CAAC;IAcrF,2BAA2B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC;IAOrG,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,SAAS,CAAC;IAyC1H,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAWrG,6BAA6B,uIAA4C;IAGzE,oBAAoB;;;;;;;;;;;OAAmC;CAExD;AAED,cAAc,wBAAwB,CAAC"}
@@ -53,10 +53,11 @@ class PublishParser {
53
53
  const publishParams = await this.getPublishParams(reqInfo, userData);
54
54
  const _methods = await applyParamsIfFunc(this.publishMethods, publishParams);
55
55
  if (_methods && Object.keys(_methods).length) {
56
- (0, prostgles_types_1.getKeys)(_methods).map(key => {
56
+ Object.entries(_methods).map(([key, method]) => {
57
57
  const isFuncLike = (maybeFunc) => (typeof maybeFunc === "function" || maybeFunc && typeof maybeFunc.then === "function");
58
- const method = _methods[key];
58
+ //@ts-ignore
59
59
  if (method && (isFuncLike(method) || (0, prostgles_types_1.isObject)(method) && isFuncLike(method.run))) {
60
+ //@ts-ignore
60
61
  methods[key] = _methods[key];
61
62
  }
62
63
  else {
@@ -141,9 +142,11 @@ exports.PublishParser = PublishParser;
141
142
  __exportStar(require("./publishTypesAndUtils"), exports);
142
143
  function applyParamsIfFunc(maybeFunc, ...params) {
143
144
  if ((maybeFunc !== null && maybeFunc !== undefined) &&
145
+ //@ts-ignore
144
146
  (typeof maybeFunc === "function" || typeof maybeFunc.then === "function")) {
145
147
  return maybeFunc(...params);
146
148
  }
149
+ //@ts-ignore
147
150
  return maybeFunc;
148
151
  }
149
152
  //# sourceMappingURL=PublishParser.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAA4D;AAI5D,2DAAwD;AACxD,iEAA8D;AAC9D,mFAAgF;AAChF,iEAAiK;AAGjK,MAAa,aAAa;IACxB,OAAO,CAAM;IACb,cAAc,CAAiD;IAC/D,aAAa,CAAO;IACpB,GAAG,CAAkB;IACrB,EAAE,CAAI;IACN,SAAS,CAAY;IAErB,YAAY,OAAY,EAAE,cAA6D,EAAE,aAAkB,EAAE,GAAoB,EAAE,EAAM,EAAE,SAAoB;QAC7J,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACnC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,4CAA4C,CAAC;IACrF,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,WAAwB,EAAE,UAAuB;QACtE,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,MAAM,aAAa,CAAA;QAClC,OAAO;YACL,GAAG,CAAC,UAAU,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;YAC/E,GAAG,EAAE,IAAI,CAAC,GAAU;YACpB,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,MAAM,EAAE,WAAW,CAAC,MAAO;YAC3B,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM;SACzC,CAAA;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAgD,EAAE,QAAqB;QAC7F,MAAM,OAAO,GAA+B,EAAE,CAAC;QAE/C,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrE,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;QAE7E,IAAI,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAA,yBAAO,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC1B,MAAM,UAAU,GAAG,CAAC,SAAuC,EAAE,EAAE,CAAC,CAAC,OAAO,SAAS,KAAK,UAAU,IAAI,SAAS,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;gBACvJ,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAA;gBAC5B,IAAI,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAA,0BAAQ,EAAC,MAAM,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;oBACjF,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;gBAC/B,CAAC;qBAAM,CAAC;oBACN,MAAM,kCAAkC,GAAG,qCAAqC,CAAA;gBAClF,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,WAAwB,EAAE,UAAuB;QAChE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAC1E,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAEtE,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;YACrB,MAAM,OAAO,GAAkB,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;gBACjD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;YAC1B,CAAC,CAAC,CAAC;YACH,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IACD,KAAK,CAAC,2BAA2B,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAmB;QAEpF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAY,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;QAChF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,UAAU,CAAC,CAAC;QAClG,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,EAAmB,EAAE,UAAuB;QACzG,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,MAAM,gCAAgC,CAAC;QAEtD,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS;YAAE,MAAM,kCAAkC,CAAC;QAErE,MAAM,GAAG,GAAG,sCAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAE,IAAI,CAAC,OAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,MAAM,mBAAmB,GAAG,OAAO,CAAC;QACtC,CAAC;QAED,+CAA+C;QAC/C,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;YAClE,OAAO,sCAAe,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvC,GAAG,CAAC;gBACJ,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS;aACtB,CAAC,EAAE,EAAE,CAAC,CAAA;QACT,CAAC;QAED,8CAA8C;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,MAAM,oBAAoB,CAAC;QAE9C,uCAAuC;QACvC,MAAM,IAAI,GAAG,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAE5E,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,CAAC,GAAG,CAAC;QAErC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,UAAU,CAAC,CAAC;QACpF,IAAI,CAAC,UAAU;YAAE,MAAM,EAAE,KAAK,EAAE,CAAC,2BAA2B,CAAC,EAAE,OAAO,EAAE,+BAA+B,GAAG,SAAS,EAAE,CAAC;QAGtH,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;YACzB,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBAC7C,MAAM,EAAE,KAAK,EAAE,CAAC,2BAA2B,CAAC,EAAE,OAAO,EAAE,uCAAuC,EAAE,CAAC;YACnG,CAAC;QACH,CAAC;QAED,IAAI,GAAG,IAAI,UAAU,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9C,OAAO,UAAU,CAAC;QACpB,CAAC;;YAAM,MAAM,EAAE,KAAK,EAAE,CAAC,2BAA2B,CAAC,EAAE,OAAO,EAAE,kCAAkC,SAAS,IAAI,OAAO,EAAE,EAAE,CAAC;IAC3H,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAc,EAAE,UAAuB;QAEzD,IAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,QAAQ,EAAC,CAAC;YACrC,MAAM,qBAAqB,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;YACxF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,qCAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,qBAAqB,EAAE,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;YAC1H,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,6BAA6B,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IACnE,CAAC;IAED,6BAA6B,GAAG,6DAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEzE,iFAAiF;IACjF,oBAAoB,GAAG,2CAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CAExD;AAtID,sCAsIC;AAED,yDAAuC;AAGvC,SAAS,iBAAiB,CAAC,SAAc,EAAE,GAAG,MAAW;IACvD,IACE,CAAC,SAAS,KAAK,IAAI,IAAI,SAAS,KAAK,SAAS,CAAC;QAC/C,CAAC,OAAO,SAAS,KAAK,UAAU,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,UAAU,CAAC,EACzE,CAAC;QACD,OAAO,SAAS,CAAC,GAAG,MAAM,CAAC,CAAC;IAC9B,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
1
+ {"version":3,"file":"PublishParser.js","sourceRoot":"","sources":["../../lib/PublishParser/PublishParser.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwB,oBAAoB,EAAqB,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAiB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG9D,KAAK,IAAI,GAAG,CAAC;IACX,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB,GAAG;IACF,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC,GAAG;IACH,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;CAClC,CAAA;AACD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC,CAqHpK"}
1
+ {"version":3,"file":"getSchemaFromPublish.d.ts","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAwB,oBAAoB,EAAqB,MAAM,iBAAiB,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAiB,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAG9D,KAAK,IAAI,GAAG,CAAC;IACX,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,CAAC,EAAE,SAAS,CAAC;CACrB,GAAG;IACF,OAAO,EAAE,UAAU,CAAC;IACpB,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB,CAAC,GAAG;IACH,QAAQ,EAAE,UAAU,GAAG,SAAS,CAAC;CAClC,CAAA;AACD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,EAAE,IAAI,GAAG,OAAO,CAAC;IAAE,MAAM,EAAE,oBAAoB,CAAC;IAAC,MAAM,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC,CAsHpK"}
@@ -5,7 +5,7 @@ const prostgles_types_1 = require("prostgles-types");
5
5
  const Prostgles_1 = require("../Prostgles");
6
6
  async function getSchemaFromPublish({ userData, ...clientReq }) {
7
7
  const schema = {};
8
- const tables = [];
8
+ let tables = [];
9
9
  try {
10
10
  /* Publish tables and views based on socket */
11
11
  const clientInfo = userData ?? await this.prostgles.authHandler?.getClientInfo(clientReq);
@@ -102,6 +102,7 @@ async function getSchemaFromPublish({ userData, ...clientReq }) {
102
102
  console.error("Prostgles \nERRORS IN PUBLISH: ", JSON.stringify(e));
103
103
  throw e;
104
104
  }
105
+ tables = tables.sort((a, b) => a.name.localeCompare(b.name));
105
106
  return { schema, tables };
106
107
  }
107
108
  exports.getSchemaFromPublish = getSchemaFromPublish;
@@ -1 +1 @@
1
- {"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"getSchemaFromPublish.js","sourceRoot":"","sources":["../../lib/PublishParser/getSchemaFromPublish.ts"],"names":[],"mappings":"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"}
@@ -45,10 +45,11 @@ export class PublishParser {
45
45
  const _methods = await applyParamsIfFunc(this.publishMethods, publishParams);
46
46
 
47
47
  if (_methods && Object.keys(_methods).length) {
48
- getKeys(_methods).map(key => {
48
+ Object.entries(_methods).map(([key, method]) => {
49
49
  const isFuncLike = (maybeFunc: VoidFunction | Promise<void>) => (typeof maybeFunc === "function" || maybeFunc && typeof maybeFunc.then === "function");
50
- const method = _methods[key]
50
+ //@ts-ignore
51
51
  if (method && (isFuncLike(method) || isObject(method) && isFuncLike(method.run))) {
52
+ //@ts-ignore
52
53
  methods[key] = _methods[key];
53
54
  } else {
54
55
  throw `invalid publishMethods item -> ${key} \n Expecting a function or promise`
@@ -146,14 +147,16 @@ export class PublishParser {
146
147
 
147
148
  export * from "./publishTypesAndUtils";
148
149
 
149
-
150
- function applyParamsIfFunc(maybeFunc: any, ...params: any): any {
150
+ type FunctionWithArguments = (...args: any) => any
151
+ function applyParamsIfFunc<T>(maybeFunc: T, ...params: any): T extends FunctionWithArguments ? ReturnType<T> : T {
151
152
  if (
152
153
  (maybeFunc !== null && maybeFunc !== undefined) &&
154
+ //@ts-ignore
153
155
  (typeof maybeFunc === "function" || typeof maybeFunc.then === "function")
154
156
  ) {
155
- return maybeFunc(...params);
157
+ return (maybeFunc as FunctionWithArguments)(...params);
156
158
  }
157
159
 
160
+ //@ts-ignore
158
161
  return maybeFunc;
159
162
  }
@@ -15,7 +15,7 @@ type Args = ({
15
15
  }
16
16
  export async function getSchemaFromPublish(this: PublishParser, { userData, ...clientReq }: Args): Promise<{ schema: TableSchemaForClient; tables: DBSchemaTable[] }> {
17
17
  const schema: TableSchemaForClient = {};
18
- const tables: DBSchemaTable[] = []
18
+ let tables: DBSchemaTable[] = []
19
19
 
20
20
  try {
21
21
  /* Publish tables and views based on socket */
@@ -129,5 +129,6 @@ export async function getSchemaFromPublish(this: PublishParser, { userData, ...c
129
129
  throw e;
130
130
  }
131
131
 
132
+ tables = tables.sort((a, b) => a.name.localeCompare(b.name));
132
133
  return { schema, tables };
133
134
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "4.2.94",
3
+ "version": "4.2.95",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
10
10
  "license": "ISC",
11
11
  "dependencies": {
12
12
  "@types/node": "^20.9.2",
13
- "prostgles-client": "^4.0.133",
13
+ "prostgles-client": "^4.0.134",
14
14
  "prostgles-types": "^4.0.51",
15
15
  "socket.io-client": "^4.7.5"
16
16
  },
@@ -330,9 +330,10 @@
330
330
  }
331
331
  },
332
332
  "node_modules/prostgles-client": {
333
- "version": "4.0.133",
334
- "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.133.tgz",
335
- "integrity": "sha512-AAQ+wZnIwu+15EZGRvkmvdM+VbXpkrwfCKtELgu4PJu3oC24ZpWaezq0nT8u1whqCBgyIWDgsVwuVKGqCGLsOg==",
333
+ "version": "4.0.134",
334
+ "resolved": "https://registry.npmjs.org/prostgles-client/-/prostgles-client-4.0.134.tgz",
335
+ "integrity": "sha512-KNoi1xoxtMmpcfffQat30Kfp2mNCsAuAt1HNqUc7bLUAl/pd/ELVQBVFkATmT709HCWkao1dwfGA2YALKF9iQw==",
336
+ "license": "MIT",
336
337
  "dependencies": {
337
338
  "prostgles-types": "^4.0.87"
338
339
  },
@@ -13,7 +13,7 @@
13
13
  "license": "ISC",
14
14
  "dependencies": {
15
15
  "@types/node": "^20.9.2",
16
- "prostgles-client": "^4.0.133",
16
+ "prostgles-client": "^4.0.134",
17
17
  "prostgles-types": "^4.0.51",
18
18
  "socket.io-client": "^4.7.5"
19
19
  },
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "4.2.93",
24
+ "version": "4.2.94",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "bluebird": "^3.7.2",