prostgles-server 3.0.95 → 3.0.97

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 (17) hide show
  1. package/.github/workflows/main.yml +1 -1
  2. package/dist/JSONBValidation/validate_jsonb_schema_sql.js +2 -2
  3. package/dist/JSONBValidation/validation.d.ts +1 -1
  4. package/dist/JSONBValidation/validation.d.ts.map +1 -1
  5. package/dist/JSONBValidation/validation.js +9 -9
  6. package/dist/JSONBValidation/validation.js.map +1 -1
  7. package/lib/JSONBValidation/validate_jsonb_schema_sql.js +2 -2
  8. package/lib/JSONBValidation/validate_jsonb_schema_sql.ts +2 -2
  9. package/lib/JSONBValidation/validation.d.ts +1 -1
  10. package/lib/JSONBValidation/validation.d.ts.map +1 -1
  11. package/lib/JSONBValidation/validation.js +9 -9
  12. package/lib/JSONBValidation/validation.ts +9 -9
  13. package/package.json +1 -1
  14. package/tests/client/PID.txt +1 -1
  15. package/tests/isomorphic_queries.ts +2 -2
  16. package/tests/server/DBoGenerated.d.ts +13 -27
  17. package/tests/server/package-lock.json +1 -1
package/.github/workflows/main.yml CHANGED
@@ -83,7 +83,7 @@ jobs:
83
83
 
84
84
  services:
85
85
  postgres:
86
- image: postgis/postgis:10-2.5
86
+ image: postgis/postgis:11-3.3
87
87
  #image: postgres:10.8
88
88
  env:
89
89
  POSTGRES_USER: api
package/dist/JSONBValidation/validate_jsonb_schema_sql.js CHANGED
@@ -45,7 +45,7 @@ BEGIN
45
45
  END IF;
46
46
 
47
47
 
48
- nullable = COALESCE((schema->'nullable')::BOOLEAN, FALSE);
48
+ nullable = COALESCE((schema->>'nullable')::BOOLEAN, FALSE);
49
49
  IF data IS NULL OR jsonb_typeof(data) = 'null' THEN
50
50
  IF NOT nullable THEN
51
51
  RAISE EXCEPTION 'Is not nullable. %', path USING HINT = path, COLUMN = colname;
@@ -158,7 +158,7 @@ BEGIN
158
158
  SELECT key, value
159
159
  FROM jsonb_each(schema->'type')
160
160
  LOOP
161
- optional = COALESCE((sub_schema.value->'optional')::BOOLEAN, FALSE);
161
+ optional = COALESCE((sub_schema.value->>'optional')::BOOLEAN, FALSE);
162
162
  IF NOT (data ? sub_schema.key) THEN
163
163
 
164
164
  IF NOT optional THEN
package/dist/JSONBValidation/validation.d.ts CHANGED
@@ -140,7 +140,7 @@ export declare function validateSchema<S extends JSONB.ObjectSchema>(schema: S,
140
140
  type ColOpts = {
141
141
  nullable?: boolean;
142
142
  };
143
- export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading?: string): string;
143
+ export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, outerLeading?: string): string;
144
144
  export declare function getJSONBSchemaAsJSONSchema(tableName: string, colName: string, columnConfig: BaseColumn<{
145
145
  en: 1;
146
146
  }> & JSONBColumnDef): JSONSchema7;
package/dist/JSONBValidation/validation.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"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"}
package/dist/JSONBValidation/validation.js CHANGED
@@ -80,8 +80,8 @@ function validateSchema(schema, obj, objName, optional = false) {
80
80
  (0, prostgles_types_1.getKeys)(schema).forEach(k => validate(obj, k, schema[k]));
81
81
  }
82
82
  exports.validateSchema = validateSchema;
83
- function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
84
- const getFieldType = (rawFieldType, isOneOf = false, innerLeading = leading) => {
83
+ function getJSONBSchemaTSTypes(schema, colOpts, outerLeading = "") {
84
+ const getFieldType = (rawFieldType, isOneOf = false, innerLeading = "", depth = 0) => {
85
85
  const fieldType = getFieldTypeObj(rawFieldType);
86
86
  const nullType = (fieldType.nullable ? `null | ` : "");
87
87
  /** Primitives */
@@ -96,10 +96,10 @@ function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
96
96
  else if ((0, prostgles_types_1.isObject)(fieldType.type)) {
97
97
  const { type } = fieldType;
98
98
  const spacing = isOneOf ? " " : " ";
99
- let objDef = `${innerLeading}{ \n` + (0, prostgles_types_1.getKeys)(type).map(k => {
99
+ let objDef = ` {${spacing}` + (0, prostgles_types_1.getKeys)(type).map(k => {
100
100
  const fieldType = getFieldTypeObj(type[k]);
101
- return `${innerLeading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType, true) + ";";
102
- }).join("\n") + ` \n${innerLeading}}`;
101
+ return `${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType, true, undefined, depth + 1) + ";";
102
+ }).join(" ") + `${spacing}}`;
103
103
  if (!objDef.endsWith(";") && !isOneOf) {
104
104
  objDef += ";";
105
105
  }
@@ -114,20 +114,20 @@ function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
114
114
  }
115
115
  else if (fieldType?.oneOf || fieldType?.oneOfType) {
116
116
  const oneOf = fieldType?.oneOf || fieldType?.oneOfType.map(type => ({ type }));
117
- return (fieldType.nullable ? `\n${innerLeading} | null` : "") + oneOf.map(v => `\n${innerLeading} | ` + getFieldType(v, true)).join("");
117
+ return (fieldType.nullable ? `\n${innerLeading} | null` : "") + oneOf.map(v => `\n${innerLeading} | ` + getFieldType(v, true, undefined, depth + 1)).join("");
118
118
  }
119
119
  else if (fieldType?.arrayOf || fieldType?.arrayOfType) {
120
120
  const arrayOf = fieldType?.arrayOf || { type: fieldType?.arrayOfType };
121
- return (fieldType.nullable ? `null | ` : "") + getFieldType(arrayOf, true) + "[]";
121
+ return (fieldType.nullable ? `null | ` : "") + getFieldType(arrayOf, true, undefined, depth + 1) + "[]";
122
122
  }
123
123
  else if (fieldType?.record) {
124
124
  const { keysEnum, values } = fieldType.record;
125
- return `${fieldType.nullable ? `null |` : ""} Record<${keysEnum?.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ") ?? "string"}, ${!values ? "any" : getFieldType(values, true)}>`;
125
+ return `${fieldType.nullable ? `null |` : ""} Record<${keysEnum?.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ") ?? "string"}, ${!values ? "any" : getFieldType(values, true, undefined, depth + 1)}>`;
126
126
  }
127
127
  else
128
128
  throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType, schema }, null, 2);
129
129
  };
130
- return getFieldType({ ...schema, nullable: colOpts.nullable }, undefined, leading);
130
+ return getFieldType({ ...schema, nullable: colOpts.nullable }, undefined, outerLeading);
131
131
  }
132
132
  exports.getJSONBSchemaTSTypes = getJSONBSchemaTSTypes;
133
133
  const getJSONSchemaObject = (rawType, rootInfo) => {
package/dist/JSONBValidation/validation.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.js","sourceRoot":"","sources":["../../lib/JSONBValidation/validation.ts"],"names":[],"mappings":"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"}
package/lib/JSONBValidation/validate_jsonb_schema_sql.js CHANGED
@@ -45,7 +45,7 @@ BEGIN
45
45
  END IF;
46
46
 
47
47
 
48
- nullable = COALESCE((schema->'nullable')::BOOLEAN, FALSE);
48
+ nullable = COALESCE((schema->>'nullable')::BOOLEAN, FALSE);
49
49
  IF data IS NULL OR jsonb_typeof(data) = 'null' THEN
50
50
  IF NOT nullable THEN
51
51
  RAISE EXCEPTION 'Is not nullable. %', path USING HINT = path, COLUMN = colname;
@@ -158,7 +158,7 @@ BEGIN
158
158
  SELECT key, value
159
159
  FROM jsonb_each(schema->'type')
160
160
  LOOP
161
- optional = COALESCE((sub_schema.value->'optional')::BOOLEAN, FALSE);
161
+ optional = COALESCE((sub_schema.value->>'optional')::BOOLEAN, FALSE);
162
162
  IF NOT (data ? sub_schema.key) THEN
163
163
 
164
164
  IF NOT optional THEN
package/lib/JSONBValidation/validate_jsonb_schema_sql.ts CHANGED
@@ -44,7 +44,7 @@ BEGIN
44
44
  END IF;
45
45
 
46
46
 
47
- nullable = COALESCE((schema->'nullable')::BOOLEAN, FALSE);
47
+ nullable = COALESCE((schema->>'nullable')::BOOLEAN, FALSE);
48
48
  IF data IS NULL OR jsonb_typeof(data) = 'null' THEN
49
49
  IF NOT nullable THEN
50
50
  RAISE EXCEPTION 'Is not nullable. %', path USING HINT = path, COLUMN = colname;
@@ -157,7 +157,7 @@ BEGIN
157
157
  SELECT key, value
158
158
  FROM jsonb_each(schema->'type')
159
159
  LOOP
160
- optional = COALESCE((sub_schema.value->'optional')::BOOLEAN, FALSE);
160
+ optional = COALESCE((sub_schema.value->>'optional')::BOOLEAN, FALSE);
161
161
  IF NOT (data ? sub_schema.key) THEN
162
162
 
163
163
  IF NOT optional THEN
package/lib/JSONBValidation/validation.d.ts CHANGED
@@ -140,7 +140,7 @@ export declare function validateSchema<S extends JSONB.ObjectSchema>(schema: S,
140
140
  type ColOpts = {
141
141
  nullable?: boolean;
142
142
  };
143
- export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading?: string): string;
143
+ export declare function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, outerLeading?: string): string;
144
144
  export declare function getJSONBSchemaAsJSONSchema(tableName: string, colName: string, columnConfig: BaseColumn<{
145
145
  en: 1;
146
146
  }> & JSONBColumnDef): JSONSchema7;
package/lib/JSONBValidation/validation.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["validation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["validation.ts"],"names":[],"mappings":"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"}
package/lib/JSONBValidation/validation.js CHANGED
@@ -80,8 +80,8 @@ function validateSchema(schema, obj, objName, optional = false) {
80
80
  (0, prostgles_types_1.getKeys)(schema).forEach(k => validate(obj, k, schema[k]));
81
81
  }
82
82
  exports.validateSchema = validateSchema;
83
- function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
84
- const getFieldType = (rawFieldType, isOneOf = false, innerLeading = leading) => {
83
+ function getJSONBSchemaTSTypes(schema, colOpts, outerLeading = "") {
84
+ const getFieldType = (rawFieldType, isOneOf = false, innerLeading = "", depth = 0) => {
85
85
  const fieldType = getFieldTypeObj(rawFieldType);
86
86
  const nullType = (fieldType.nullable ? `null | ` : "");
87
87
  /** Primitives */
@@ -96,10 +96,10 @@ function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
96
96
  else if ((0, prostgles_types_1.isObject)(fieldType.type)) {
97
97
  const { type } = fieldType;
98
98
  const spacing = isOneOf ? " " : " ";
99
- let objDef = `${innerLeading}{ \n` + (0, prostgles_types_1.getKeys)(type).map(k => {
99
+ let objDef = ` {${spacing}` + (0, prostgles_types_1.getKeys)(type).map(k => {
100
100
  const fieldType = getFieldTypeObj(type[k]);
101
- return `${innerLeading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType, true) + ";";
102
- }).join("\n") + ` \n${innerLeading}}`;
101
+ return `${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType, true, undefined, depth + 1) + ";";
102
+ }).join(" ") + `${spacing}}`;
103
103
  if (!objDef.endsWith(";") && !isOneOf) {
104
104
  objDef += ";";
105
105
  }
@@ -114,20 +114,20 @@ function getJSONBSchemaTSTypes(schema, colOpts, leading = "") {
114
114
  }
115
115
  else if (fieldType?.oneOf || fieldType?.oneOfType) {
116
116
  const oneOf = fieldType?.oneOf || fieldType?.oneOfType.map(type => ({ type }));
117
- return (fieldType.nullable ? `\n${innerLeading} | null` : "") + oneOf.map(v => `\n${innerLeading} | ` + getFieldType(v, true)).join("");
117
+ return (fieldType.nullable ? `\n${innerLeading} | null` : "") + oneOf.map(v => `\n${innerLeading} | ` + getFieldType(v, true, undefined, depth + 1)).join("");
118
118
  }
119
119
  else if (fieldType?.arrayOf || fieldType?.arrayOfType) {
120
120
  const arrayOf = fieldType?.arrayOf || { type: fieldType?.arrayOfType };
121
- return (fieldType.nullable ? `null | ` : "") + getFieldType(arrayOf, true) + "[]";
121
+ return (fieldType.nullable ? `null | ` : "") + getFieldType(arrayOf, true, undefined, depth + 1) + "[]";
122
122
  }
123
123
  else if (fieldType?.record) {
124
124
  const { keysEnum, values } = fieldType.record;
125
- return `${fieldType.nullable ? `null |` : ""} Record<${keysEnum?.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ") ?? "string"}, ${!values ? "any" : getFieldType(values, true)}>`;
125
+ return `${fieldType.nullable ? `null |` : ""} Record<${keysEnum?.map(v => (0, PubSubManager_1.asValue)(v)).join(" | ") ?? "string"}, ${!values ? "any" : getFieldType(values, true, undefined, depth + 1)}>`;
126
126
  }
127
127
  else
128
128
  throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType, schema }, null, 2);
129
129
  };
130
- return getFieldType({ ...schema, nullable: colOpts.nullable }, undefined, leading);
130
+ return getFieldType({ ...schema, nullable: colOpts.nullable }, undefined, outerLeading);
131
131
  }
132
132
  exports.getJSONBSchemaTSTypes = getJSONBSchemaTSTypes;
133
133
  const getJSONSchemaObject = (rawType, rootInfo) => {
package/lib/JSONBValidation/validation.ts CHANGED
@@ -224,9 +224,9 @@ export function validateSchema<S extends JSONB.ObjectSchema>(schema: S, obj: JSO
224
224
  type ColOpts = { nullable?: boolean };
225
225
 
226
226
 
227
- export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, leading = ""): string {
227
+ export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpts, outerLeading = ""): string {
228
228
 
229
- const getFieldType = (rawFieldType: JSONB.FieldType, isOneOf = false, innerLeading = leading): string => {
229
+ const getFieldType = (rawFieldType: JSONB.FieldType, isOneOf = false, innerLeading = "", depth = 0): string => {
230
230
  const fieldType = getFieldTypeObj(rawFieldType);
231
231
  const nullType = (fieldType.nullable ? `null | ` : "");
232
232
 
@@ -242,10 +242,10 @@ export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpt
242
242
  } else if (isObject(fieldType.type)) {
243
243
  const { type } = fieldType;
244
244
  const spacing = isOneOf ? " " : " ";
245
- let objDef = `${innerLeading}{ \n` + getKeys(type).map(k => {
245
+ let objDef = ` {${spacing}` + getKeys(type).map(k => {
246
246
  const fieldType = getFieldTypeObj(type[k]);
247
- return `${innerLeading}${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType, true) + ";";
248
- }).join("\n") + ` \n${innerLeading}}`;
247
+ return `${spacing}${k}${fieldType.optional ? "?" : ""}: ` + getFieldType(fieldType, true, undefined, depth + 1) + ";";
248
+ }).join(" ") + `${spacing}}`;
249
249
  if(!objDef.endsWith(";") && !isOneOf){
250
250
  objDef += ";";
251
251
  }
@@ -261,20 +261,20 @@ export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpt
261
261
 
262
262
  } else if (fieldType?.oneOf || fieldType?.oneOfType) {
263
263
  const oneOf = fieldType?.oneOf || fieldType?.oneOfType.map(type => ({ type }));
264
- return (fieldType.nullable ? `\n${innerLeading} | null` : "") + oneOf.map(v => `\n${innerLeading} | ` + getFieldType(v, true)).join("");
264
+ return (fieldType.nullable ? `\n${innerLeading} | null` : "") + oneOf.map(v => `\n${innerLeading} | ` + getFieldType(v, true, undefined, depth + 1)).join("");
265
265
 
266
266
  } else if (fieldType?.arrayOf || fieldType?.arrayOfType) {
267
267
  const arrayOf = fieldType?.arrayOf || { type: fieldType?.arrayOfType };
268
- return (fieldType.nullable ? `null | ` : "") + getFieldType(arrayOf, true) + "[]";
268
+ return (fieldType.nullable ? `null | ` : "") + getFieldType(arrayOf, true, undefined, depth + 1) + "[]";
269
269
 
270
270
  } else if (fieldType?.record) {
271
271
  const { keysEnum, values } = fieldType.record;
272
- return `${fieldType.nullable ? `null |` : ""} Record<${keysEnum?.map(v => asValue(v)).join(" | ") ?? "string"}, ${!values? "any" : getFieldType(values, true)}>`
272
+ return `${fieldType.nullable ? `null |` : ""} Record<${keysEnum?.map(v => asValue(v)).join(" | ") ?? "string"}, ${!values? "any" : getFieldType(values, true, undefined, depth + 1)}>`
273
273
 
274
274
  } else throw "Unexpected getSchemaTSTypes: " + JSON.stringify({ fieldType, schema }, null, 2)
275
275
  }
276
276
 
277
- return getFieldType({ ...schema as any, nullable: colOpts.nullable }, undefined, leading);
277
+ return getFieldType({ ...schema as any, nullable: colOpts.nullable }, undefined, outerLeading);
278
278
  }
279
279
 
280
280
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "prostgles-server",
3
- "version": "3.0.95",
3
+ "version": "3.0.97",
4
4
  "description": "",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/tests/client/PID.txt CHANGED
@@ -1 +1 @@
1
- 458114
1
+ 7250
package/tests/isomorphic_queries.ts CHANGED
@@ -20,10 +20,10 @@ export async function tryRun(desc: string, func: () => any, log?: Function){
20
20
  export function tryRunP(desc: string, func: (resolve: any, reject: any) => any, opts?: { log?: Function; timeout?: number; }){
21
21
  return new Promise(async (rv, rj) => {
22
22
  const tout = Number.isFinite(opts?.timeout)? setTimeout(() => {
23
- const errMsg = `${desc} failed. Reason: Timout reached: ${opts.timeout}ms`;
23
+ const errMsg = `${desc} failed. Reason: Timout reached: ${opts!.timeout}ms`;
24
24
  opts?.log?.(errMsg);
25
25
  rj(errMsg);
26
- }, opts.timeout) : undefined
26
+ }, opts!.timeout) : undefined
27
27
  try {
28
28
  await func(rv, rj);
29
29
  clearTimeout(tout);
package/tests/server/DBoGenerated.d.ts CHANGED
@@ -369,30 +369,20 @@ export type DBSchemaGenerated = {
369
369
  delete: true;
370
370
  columns: {
371
371
  colOneOf: "a" | "b" | "c"
372
- json: {
373
- a: boolean;
374
- arr: '1' | '2' | '3';
375
- arr1: 1 | 2 | 3;
376
- arr2: number[];
377
- arrStr?: null | string[];
378
- o?:
379
- | null
380
- | { o1: number; }
381
- | { o2: boolean; };
382
- };
372
+ json: { a: boolean; arr: '1' | '2' | '3'; arr1: 1 | 2 | 3; arr2: number[]; arrStr?: null | string[]; o?:
373
+ | null
374
+ | { o1: number; }
375
+ | { o2: boolean; }; };
383
376
  jsonOneOf?:
384
- | null
385
- | { command: 'a'; }
386
- | { command: 'b'; option: number[]; }
377
+ | null
378
+ | { command: 'a'; }
379
+ | { command: 'b'; option: number[]; }
387
380
  status?:
388
- | null
389
- | { ok: string; }
390
- | { err: string; }
391
- | { loading: { loaded: number; total: number; }; }
392
- table_config?: null | {
393
- referencedTables?: { name: string; minFiles: number; }[];
394
- recType?: null | Record<'a' | 'b', { bools: boolean[]; }>;
395
- };
381
+ | null
382
+ | { ok: string; }
383
+ | { err: string; }
384
+ | { loading: { loaded: number; total: number; }; }
385
+ table_config?: null | { referencedTables?: { name: string; minFiles: number; }[]; recType?: null | Record<'a' | 'b', { bools: boolean[]; }>; };
396
386
  };
397
387
  };
398
388
  tr1: {
@@ -448,11 +438,7 @@ export type DBSchemaGenerated = {
448
438
  columns: {
449
439
  email: string;
450
440
  id?: number;
451
- preferences?: {
452
- showIntro?: boolean;
453
- theme?: 'light' | 'dark' | 'auto';
454
- others: any[];
455
- };
441
+ preferences?: { showIntro?: boolean; theme?: 'light' | 'dark' | 'auto'; others: any[]; };
456
442
  status: "active" | "disabled" | "pending"
457
443
  };
458
444
  };
package/tests/server/package-lock.json CHANGED
@@ -21,7 +21,7 @@
21
21
  },
22
22
  "../..": {
23
23
  "name": "prostgles-server",
24
- "version": "3.0.94",
24
+ "version": "3.0.96",
25
25
  "license": "MIT",
26
26
  "dependencies": {
27
27
  "@aws-sdk/client-s3": "^3.272.0",